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

7167092: Need to put the return clause in the synchronized block

Browse Source 
A regression fix for bug 7153184

Reviewed-by: wetmore
This commit is contained in:
Xue-Lei Andrew Fan 2012-05-08 17:56:18 -07:00
parent 30fb5c8146
commit f44a8ebe07
1 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
jdk/src/share/classes/sun/security/ssl/SSLContextImpl.java
View File

@ -276,39 +276,33 @@ public abstract class SSLContextImpl extends SSLContextSpi {
supportedCipherSuiteList = getApplicableCipherSuiteList(
getSuportedProtocolList(), false);
}
}
return supportedCipherSuiteList;
return supportedCipherSuiteList;
}
}
// Get default CipherSuiteList.
CipherSuiteList getDefaultCipherSuiteList(boolean roleIsServer) {
if (roleIsServer) {
// The maintenance of cipher suites needs to be synchronized.
synchronized (this) {
// Clear cache of available ciphersuites.
clearAvailableCache();
// The maintenance of cipher suites needs to be synchronized.
synchronized (this) {
// Clear cache of available ciphersuites.
clearAvailableCache();
if (roleIsServer) {
if (defaultServerCipherSuiteList == null) {
defaultServerCipherSuiteList = getApplicableCipherSuiteList(
getDefaultProtocolList(true), true);
}
}
return defaultServerCipherSuiteList;
} else {
// The maintenance of cipher suites needs to be synchronized
synchronized (this) {
// Clear cache of available ciphersuites.
clearAvailableCache();
return defaultServerCipherSuiteList;
} else {
if (defaultClientCipherSuiteList == null) {
defaultClientCipherSuiteList = getApplicableCipherSuiteList(
getDefaultProtocolList(false), true);
}
}
return defaultClientCipherSuiteList;
return defaultClientCipherSuiteList;
}
}
}