aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Koch <konqueror@gmx.de>2004-05-11 19:48:45 +0000
committerMichael Koch <mkoch@gcc.gnu.org>2004-05-11 19:48:45 +0000
commit8f0b9daaa2299023b4c34aa46cd1f0d83d35ef82 (patch)
treee6dd07ee71860e6fff8a89bcf4fead2b8488135c
parent525696406dd38458adb8ad682b22dcef1eb7e1d4 (diff)
downloadgcc-8f0b9daaa2299023b4c34aa46cd1f0d83d35ef82.zip
gcc-8f0b9daaa2299023b4c34aa46cd1f0d83d35ef82.tar.gz
gcc-8f0b9daaa2299023b4c34aa46cd1f0d83d35ef82.tar.bz2
2004-05-11 Michael Koch <konqueror@gmx.de>
* gnu/java/net/natPlainSocketImplPosix.cc (read): Fixed typo in expression. From-SVN: r81714
-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 5b1edcc..72df26c 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 ee2f393..7fd4fe0 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;
}