2004-05-11 Michael Koch <konqueror@gmx.de>

	* gnu/java/net/natPlainSocketImplPosix.cc
	(read): Fixed typo in expression.

From-SVN: r81714

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 5b1edccbbe853f5f0f358e89537239a4dd302d11..72df26c590f15ab3d7e54495727779de8bbab9a8 100644 (file)
--- 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 ee2f39352a5f5b361ae5f54b9437c4f8a1faabdc..7fd4fe04d6f6d53f3651e0243c40abee18db9d38 100644 (file)
--- 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;
 }