diff options
| -rw-r--r-- | libjava/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/gnu/java/net/natPlainSocketImplPosix.cc | 2 |
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; } |
