diff options
| author | Mohan Embar <gnustuff@thisiscool.com> | 2003-12-16 22:47:53 +0000 |
|---|---|---|
| committer | Mohan Embar <membar@gcc.gnu.org> | 2003-12-16 22:47:53 +0000 |
| commit | 027e655b6eb26b1a17355c0ad4d97baf9d418a30 (patch) | |
| tree | 4f2d37e377b3f1098dd21d30250c36e6e97c789a /libjava | |
| parent | 93cbdb1a0c73490d416962148ad066a46052a751 (diff) | |
| download | gcc-027e655b6eb26b1a17355c0ad4d97baf9d418a30.zip gcc-027e655b6eb26b1a17355c0ad4d97baf9d418a30.tar.gz gcc-027e655b6eb26b1a17355c0ad4d97baf9d418a30.tar.bz2 | |
* gnu/java/net/natPlainDatagramSocketImplPosix.cc
(peekData): Throw SocketTimeoutException instead of
InterruptedIOException on timeout.
(receive): Likewise.
* gnu/java/net/natPlainSocketImplPosix.cc
(read): Made a minor exception text case change.
From-SVN: r74714
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 9 | ||||
| -rw-r--r-- | libjava/gnu/java/net/natPlainDatagramSocketImplPosix.cc | 7 | ||||
| -rw-r--r-- | libjava/gnu/java/net/natPlainSocketImplPosix.cc | 8 |
3 files changed, 18 insertions, 6 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 4912ebe..1b5cf7e 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,12 @@ +2003-12-16 Mohan Embar <gnustuff@thisiscool.com> + + * gnu/java/net/natPlainDatagramSocketImplPosix.cc + (peekData): Throw SocketTimeoutException instead of + InterruptedIOException on timeout. + (receive): Likewise. + * gnu/java/net/natPlainSocketImplPosix.cc + (read): Made a minor exception text case change. + 2003-12-16 Michael Koch <konqueror@gmx.de> Fix for PR libgcj/13056. diff --git a/libjava/gnu/java/net/natPlainDatagramSocketImplPosix.cc b/libjava/gnu/java/net/natPlainDatagramSocketImplPosix.cc index f296d12..e51c764 100644 --- a/libjava/gnu/java/net/natPlainDatagramSocketImplPosix.cc +++ b/libjava/gnu/java/net/natPlainDatagramSocketImplPosix.cc @@ -29,6 +29,7 @@ details. */ #include <java/io/InterruptedIOException.h> #include <java/net/BindException.h> #include <java/net/SocketException.h> +#include <java/net/SocketTimeoutException.h> #include <java/net/InetAddress.h> #include <java/net/NetworkInterface.h> #include <java/net/DatagramPacket.h> @@ -225,7 +226,8 @@ gnu::java::net::PlainDatagramSocketImpl::peekData (::java::net::DatagramPacket * if ((retval = _Jv_select (native_fd + 1, &rset, NULL, NULL, &tv)) < 0) goto error; else if (retval == 0) - throw new ::java::io::InterruptedIOException (); + throw new ::java::net::SocketTimeoutException + (JvNewStringUTF ("PeekData timed out") ); } retlen = @@ -345,7 +347,8 @@ gnu::java::net::PlainDatagramSocketImpl::receive (::java::net::DatagramPacket *p if ((retval = _Jv_select (native_fd + 1, &rset, NULL, NULL, &tv)) < 0) goto error; else if (retval == 0) - throw new ::java::io::InterruptedIOException (); + throw new ::java::net::SocketTimeoutException + (JvNewStringUTF ("Receive timed out") ); } retlen = diff --git a/libjava/gnu/java/net/natPlainSocketImplPosix.cc b/libjava/gnu/java/net/natPlainSocketImplPosix.cc index 3163db5..c02d5a0 100644 --- a/libjava/gnu/java/net/natPlainSocketImplPosix.cc +++ b/libjava/gnu/java/net/natPlainSocketImplPosix.cc @@ -408,7 +408,7 @@ gnu::java::net::PlainSocketImpl$SocketInputStream::read(void) // that means we've timed out. if (sel_retval == 0) throw new ::java::net::SocketTimeoutException - (JvNewStringUTF ("read timed out") ); + (JvNewStringUTF ("Read timed out") ); // If select returns ok we know we either got signalled or read some data... // either way we need to try to read. } @@ -422,7 +422,7 @@ gnu::java::net::PlainSocketImpl$SocketInputStream::read(void) { ::java::io::InterruptedIOException *iioe = new ::java::io::InterruptedIOException - (JvNewStringUTF("read interrupted")); + (JvNewStringUTF("Read interrupted")); iioe->bytesTransferred = r == -1 ? 0 : r; throw iioe; } @@ -478,7 +478,7 @@ gnu::java::net::PlainSocketImpl$SocketInputStream::read(jbyteArray buffer, jint { ::java::net::SocketTimeoutException *timeoutException = new ::java::net::SocketTimeoutException - (JvNewStringUTF ("read timed out")); + (JvNewStringUTF ("Read timed out")); throw timeoutException; } } @@ -493,7 +493,7 @@ gnu::java::net::PlainSocketImpl$SocketInputStream::read(jbyteArray buffer, jint { ::java::io::InterruptedIOException *iioe = new ::java::io::InterruptedIOException - (JvNewStringUTF ("read interrupted")); + (JvNewStringUTF ("Read interrupted")); iioe->bytesTransferred = r == -1 ? 0 : r; throw iioe; } |