diff options
| author | Michael Koch <konqueror@gmx.de> | 2004-04-21 12:48:02 +0000 |
|---|---|---|
| committer | Michael Koch <mkoch@gcc.gnu.org> | 2004-04-21 12:48:02 +0000 |
| commit | 6e90ed190e76ce61bf121046e9dc16bf89b051ff (patch) | |
| tree | 5a29afcb071ee1ad79d7faa3a09109327a324988 /libjava | |
| parent | af4b94345e257e98a61127d9ea9624ff4dabc714 (diff) | |
| download | gcc-6e90ed190e76ce61bf121046e9dc16bf89b051ff.zip gcc-6e90ed190e76ce61bf121046e9dc16bf89b051ff.tar.gz gcc-6e90ed190e76ce61bf121046e9dc16bf89b051ff.tar.bz2 | |
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
Diffstat (limited to 'libjava')
| -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 b8bcec2..04c0876 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,5 +1,10 @@ 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, 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; } |