2004-04-21 Michael Koch <konqueror@gmx.de>

	* gnu/java/net/natPlainSocketImplPosix.cc
	(SocketInputStream::read): Make sure returned data is a byte value.

From-SVN: r80959

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index b8bcec2bfabbec92cdf62e1c86b257ccf17bea4c..04c0876b87910df1cab182b3d3a29d508e9580b5 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2004-04-21  Michael Koch  <konqueror@gmx.de>
+
+       * gnu/java/net/natPlainSocketImplPosix.cc
+       (SocketInputStream::read): Make sure returned data is a byte value.
+
 2004-04-21  Michael Koch  <konqueror@gmx.de>
 
        * gnu/classpath/ServiceFactory.java,

diff --git a/libjava/gnu/java/net/natPlainSocketImplPosix.cc b/libjava/gnu/java/net/natPlainSocketImplPosix.cc
index 1dbc90d60104c6cd7c7b8e6c2dbe66b203f2bc90..ee2f39352a5f5b361ae5f54b9437c4f8a1faabdc 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;
+    return data && 0xFF;
 
   return -1;
 }