stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

7096436: (sc) SocketChannel.connect fails on Windows 8 when channel configured non-blocking

Browse Source 
Set localAddress only when connection is established

Reviewed-by: alanb
This commit is contained in:
Kurchi Subhra Hazra 2012-05-09 16:55:55 -07:00
parent 34aa937e99
commit 2c13671808
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
jdk/src/share/classes/sun/nio/ch/SocketChannelImpl.java
View File

@ -629,17 +629,6 @@ class SocketChannelImpl
break; break;
} }
synchronized (stateLock) {
if (isOpen() && (localAddress == null) ||
((InetSocketAddress)localAddress)
.getAddress().isAnyLocalAddress())
{
// Socket was not bound before connecting or
// Socket was bound with an "anyLocalAddress"
localAddress = Net.localAddress(fd);
}
}
} finally { } finally {
readerCleanup(); readerCleanup();
end((n > 0) || (n == IOStatus.UNAVAILABLE)); end((n > 0) || (n == IOStatus.UNAVAILABLE));
@ -659,6 +648,8 @@ class SocketChannelImpl
// Connection succeeded; disallow further // Connection succeeded; disallow further
// invocation // invocation
state = ST_CONNECTED; state = ST_CONNECTED;
if (isOpen())
localAddress = Net.localAddress(fd);
return true; return true;
} }
// If nonblocking and no exception then connection // If nonblocking and no exception then connection
@ -747,6 +738,8 @@ class SocketChannelImpl
if (n > 0) { if (n > 0) {
synchronized (stateLock) { synchronized (stateLock) {
state = ST_CONNECTED; state = ST_CONNECTED;
if (isOpen())
localAddress = Net.localAddress(fd);
} }
return true; return true;
} }