summaryrefslogtreecommitdiffstats
path: root/libjava
diff options
context:
space:
mode:
authormkoch <mkoch@138bc75d-0d04-0410-961f-82ee72b054a4>2004-05-11 19:48:45 +0000
committermkoch <mkoch@138bc75d-0d04-0410-961f-82ee72b054a4>2004-05-11 19:48:45 +0000
commitedc16a06b490a27833a2049ba0af698b8c1899b6 (patch)
treee6dd07ee71860e6fff8a89bcf4fead2b8488135c /libjava
parentb20f5036c5b3bdbcc3350ee651d4871a9333addf (diff)
downloadppe42-gcc-edc16a06b490a27833a2049ba0af698b8c1899b6.tar.gz
ppe42-gcc-edc16a06b490a27833a2049ba0af698b8c1899b6.zip
2004-05-11 Michael Koch <konqueror@gmx.de>
* gnu/java/net/natPlainSocketImplPosix.cc (read): Fixed typo in expression. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@81714 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
-rw-r--r--libjava/ChangeLog5
-rw-r--r--libjava/gnu/java/net/natPlainSocketImplPosix.cc2
2 files changed, 6 insertions, 1 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 5b1edccbbe8..72df26c590f 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2004-05-11 Michael Koch <konqueror@gmx.de>
+
+ * gnu/java/net/natPlainSocketImplPosix.cc
+ (read): Fixed typo in expression.
+
2004-05-10 Andreas Tobler <a.tobler@schweiz.ch>
* testsuite/lib/libjava.exp (libjava_invoke): Add new argument
diff --git a/libjava/gnu/java/net/natPlainSocketImplPosix.cc b/libjava/gnu/java/net/natPlainSocketImplPosix.cc
index ee2f39352a5..7fd4fe04d6f 100644
--- a/libjava/gnu/java/net/natPlainSocketImplPosix.cc
+++ b/libjava/gnu/java/net/natPlainSocketImplPosix.cc
@@ -380,7 +380,7 @@ gnu::java::net::PlainSocketImpl$SocketInputStream::read(void)
jbyte data;
if (read_helper (this$0->native_fd, this$0->timeout, &data, 1) == 1)
- return data && 0xFF;
+ return data & 0xFF;
return -1;
}
OpenPOWER on IntegriCloud