1berry/openjdk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

7088747: Use multicatch in Socket constructor

Browse Source 
Reviewed-by: alanb
This commit is contained in:
Michael McMahon 2011-09-09 15:24:35 +01:00
parent 2eb4e18d75
commit d961381c47
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -420,15 +420,14 @@ class Socket implements java.io.Closeable {
createImpl(stream); createImpl(stream);
if (localAddr != null) if (localAddr != null)
bind(localAddr); bind(localAddr);
if (address != null) connect(address);
connect(address); } catch (IOException | IllegalArgumentException | SecurityException e) {
} catch (IOException e) { try {
close();
throw e;
} finally {
// if bind() or connect threw a runtime exception
if ((localAddr != null && !bound) || (address != null && !connected))
close(); close();
} catch (IOException ce) {
e.addSuppressed(ce);
}
throw e;
} }
} }