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

7085981: XXSocket types depend on impl finalizer to close if constructor throws exception

Browse Source 
Reviewed-by: alanb, chegar
This commit is contained in:
Michael McMahon 2011-09-09 14:04:44 +01:00
parent 6b8980e983
commit 518e846e10
3 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
jdk/src/share/classes/java/net/DatagramSocket.java
View File

@ -174,9 +174,7 @@ class DatagramSocket implements java.io.Closeable {
* @see SecurityManager#checkListen
*/
public DatagramSocket() throws SocketException {
// create a datagram socket.
createImpl();
bind(new InetSocketAddress(0));
this(new InetSocketAddress(0));
}
/**
@ -221,7 +219,12 @@ class DatagramSocket implements java.io.Closeable {
// create a datagram socket.
createImpl();
if (bindaddr != null) {
bind(bindaddr);
try {
bind(bindaddr);
} finally {
if (!isBound())
close();
}
}
}

7
jdk/src/share/classes/java/net/MulticastSocket.java
View File

@ -162,7 +162,12 @@ class MulticastSocket extends DatagramSocket {
setReuseAddress(true);
if (bindaddr != null) {
bind(bindaddr);
try {
bind(bindaddr);
} finally {
if (!isBound())
close();
}
}
}

4
jdk/src/share/classes/java/net/Socket.java
View File

@ -425,6 +425,10 @@ class Socket implements java.io.Closeable {
} catch (IOException e) {
close();
throw e;
} finally {
// if bind() or connect threw a runtime exception
if ((localAddr != null && !bound) || (address != null && !connected))
close();
}
}