mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-04-04 23:01:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

natPlainDatagramSocketImplWin32.cc: Removed unused InterruptedIOException.h include.

Browse Source 
* gnu/java/net/natPlainDatagramSocketImplWin32.cc:
	Removed unused InterruptedIOException.h include.
	* gnu/java/net/natPlainSocketImplWin32.cc
	(connect): Reset and ignore our thread's interrupted
	flag instead of testing and throwing an InterruptedIOException
	if set.
	(accept): Likewise + changed case of SocketTimeoutException
	text.
	(write): Likewise (for both overloads).
	(doRead): Likewise.

From-SVN: r74716
This commit is contained in:
Mohan Embar 2003-12-16 22:57:06 +00:00 committed by Mohan Embar
parent 5cd4d463f9
commit 89c5711036
3 changed files with 37 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libjava/ChangeLog
View File

@ -1,3 +1,16 @@
2003-12-16 Mohan Embar <gnustuff@thisiscool.com>
* gnu/java/net/natPlainDatagramSocketImplWin32.cc:
Removed unused InterruptedIOException.h include.
* gnu/java/net/natPlainSocketImplWin32.cc
(connect): Reset and ignore our thread's interrupted
flag instead of testing and throwing an InterruptedIOException
if set.
(accept): Likewise + changed case of SocketTimeoutException
text.
(write): Likewise (for both overloads).
(doRead): Likewise.
2003-12-16 Mohan Embar <gnustuff@thisiscool.com>
* win32.cc (WSAEventWrapper): Implemented default

1
libjava/gnu/java/net/natPlainDatagramSocketImplWin32.cc
View File

@ -17,7 +17,6 @@ details. */
#include <gnu/java/net/PlainDatagramSocketImpl.h>
#include <java/io/IOException.h>
#include <java/io/InterruptedIOException.h>
#include <java/net/BindException.h>
#include <java/net/SocketException.h>
#include <java/net/InetAddress.h>

53
libjava/gnu/java/net/natPlainSocketImplWin32.cc
View File

@ -17,7 +17,6 @@ details. */
#include <gnu/java/net/PlainSocketImpl$SocketInputStream.h>
#include <gnu/java/net/PlainSocketImpl$SocketOutputStream.h>
#include <java/io/IOException.h>
#include <java/io/InterruptedIOException.h>
#include <java/net/BindException.h>
#include <java/net/ConnectException.h>
#include <java/net/InetAddress.h>
@ -176,9 +175,13 @@ gnu::java::net::PlainSocketImpl::connect (::java::net::SocketAddress *addr,
// use true, false instead of TRUE, FALSE because the
// MS constants got undefined
// Reset and ignore our thread's interrupted flag.
// It's not possible to interrupt these sort of
// operations on Win32 anyway.
::java::lang::Thread::interrupted();
if (dwRet == WSA_WAIT_FAILED)
throwConnectException ();
else if (dwRet == WSA_WAIT_TIMEOUT)
throw new ::java::net::SocketTimeoutException
(JvNewStringUTF ("connect timed out"));
@ -275,11 +278,14 @@ gnu::java::net::PlainSocketImpl::accept (gnu::java::net::PlainSocketImpl *s)
// use true, false instead of TRUE, FALSE because the
// MS constants got undefined
// Reset and ignore our thread's interrupted flag.
::java::lang::Thread::interrupted();
if (dwRet == WSA_WAIT_FAILED)
goto error;
else if (dwRet == WSA_WAIT_TIMEOUT)
throw new ::java::net::SocketTimeoutException
(JvNewStringUTF ("accept timed out"));
(JvNewStringUTF ("Accept timed out"));
}
}
else
@ -361,14 +367,12 @@ gnu::java::net::PlainSocketImpl$SocketOutputStream::write(jint b)
if (r == -1)
{
DWORD dwErr = WSAGetLastError();
if (::java::lang::Thread::interrupted())
{
::java::io::InterruptedIOException *iioe
= new ::java::io::InterruptedIOException
(_Jv_WinStrError (dwErr));
iioe->bytesTransferred = 0;
throw iioe;
}
// Reset and ignore our thread's interrupted flag.
// It's not possible to interrupt these sort of
// operations on Win32 anyway.
::java::lang::Thread::interrupted();
// Some errors should not cause exceptions.
if (dwErr != WSAENOTCONN && dwErr != WSAECONNRESET
&& dwErr != WSAENOTSOCK)
@ -397,14 +401,10 @@ gnu::java::net::PlainSocketImpl$SocketOutputStream::write(jbyteArray b,
if (r == -1)
{
DWORD dwErr = WSAGetLastError();
if (::java::lang::Thread::interrupted())
{
::java::io::InterruptedIOException *iioe
= new ::java::io::InterruptedIOException
(_Jv_WinStrError (dwErr));
iioe->bytesTransferred = written;
throw iioe;
}
// Reset and ignore our thread's interrupted flag.
::java::lang::Thread::interrupted();
// Some errors should not cause exceptions.
if (dwErr != WSAENOTCONN && dwErr != WSAECONNRESET
&& dwErr != WSAENOTSOCK)
@ -456,15 +456,10 @@ doRead(int native_fd, void* buf, int count, int timeout)
dwErrorCode = WSAGetLastError ();
// save WSAGetLastError() before calling Thread.interrupted()
if (::java::lang::Thread::interrupted())
{
::java::io::InterruptedIOException *iioe =
new ::java::io::InterruptedIOException
(JvNewStringUTF("read interrupted"));
iioe->bytesTransferred = r == -1 ? 0 : r;
throw iioe;
}
else if (r == -1)
// Reset and ignore our thread's interrupted flag.
::java::lang::Thread::interrupted();
if (r == -1)
{
error:
// Some errors cause us to return end of stream...
@ -474,7 +469,7 @@ error:
// Other errors need to be signalled.
if (dwErrorCode == WSAETIMEDOUT)
throw new ::java::net::SocketTimeoutException
(JvNewStringUTF ("read timed out") );
(JvNewStringUTF ("Read timed out") );
else
_Jv_ThrowIOException (dwErrorCode);
}