From 401396d97c019e605548fa16975a6d18f4c2c464 Mon Sep 17 00:00:00 2001 From: mkoch Date: Wed, 21 Apr 2004 12:48:02 +0000 Subject: [PATCH] 2004-04-21 Michael Koch * gnu/java/net/natPlainSocketImplPosix.cc (SocketInputStream::read): Make sure returned data is a byte value. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@80959 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/ChangeLog | 5 +++++ libjava/gnu/java/net/natPlainSocketImplPosix.cc | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index b8bcec2..04c0876 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,5 +1,10 @@ 2004-04-21 Michael Koch + * gnu/java/net/natPlainSocketImplPosix.cc + (SocketInputStream::read): Make sure returned data is a byte value. + +2004-04-21 Michael Koch + * gnu/classpath/ServiceFactory.java, gnu/classpath/ServiceProviderLoadingAction.java, javax/imageio/ImageReader.java, diff --git a/libjava/gnu/java/net/natPlainSocketImplPosix.cc b/libjava/gnu/java/net/natPlainSocketImplPosix.cc index 1dbc90d..ee2f393 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; + return data && 0xFF; return -1; } -- 2.7.4