[jbossweb-commits] JBossWeb SVN: r2474 - in branches: 7.5.x/src/main/java/org/apache/tomcat/util/net/jsse/openssl and 1 other directory.

Author: remy.maucherat(a)jboss.com Date: 2014-07-10 10:03:20 -0400 (Thu, 10 Jul 2014) New Revision: 2474 Modified: branches/7.4.x/src/main/java/org/apache/tomcat/util/net/jsse/openssl/OpenSSLCipherConfigurationParser.java branches/7.5.x/src/main/java/org/apache/tomcat/util/net/jsse/openssl/OpenSSLCipherConfigurationParser.java Log: BZ1117821: Add sync to deal with parallel initialization of more than one SSL connector. Patch by Emmanuel Hugonnet. Modified: branches/7.4.x/src/main/java/org/apache/tomcat/util/net/jsse/openssl/OpenSSLCipherConfigurationParser.java =================================================================== --- branches/7.4.x/src/main/java/org/apache/tomcat/util/net/jsse/openssl/OpenSSLCipherConfigurationParser.java 2014-07-03 12:20:03 UTC (rev 2473) +++ branches/7.4.x/src/main/java/org/apache/tomcat/util/net/jsse/openssl/OpenSSLCipherConfigurationParser.java 2014-07-10 14:03:20 UTC (rev 2474) @@ -30,6 +30,7 @@ import java.util.List; import java.util.Map; import java.util.Set; + import org.apache.tomcat.util.net.jsse.JSSELogger; /** @@ -598,8 +599,10 @@ } static LinkedHashSet<Ciphers> parse(String expression) { - if (!initialized) { - init(); + synchronized (OpenSSLCipherConfigurationParser.class) { + if (!initialized) { + init(); + } } String[] elements = expression.split(SEPARATOR); LinkedHashSet<Ciphers> ciphers = new LinkedHashSet<Ciphers>(); Modified: branches/7.5.x/src/main/java/org/apache/tomcat/util/net/jsse/openssl/OpenSSLCipherConfigurationParser.java =================================================================== --- branches/7.5.x/src/main/java/org/apache/tomcat/util/net/jsse/openssl/OpenSSLCipherConfigurationParser.java 2014-07-03 12:20:03 UTC (rev 2473) +++ branches/7.5.x/src/main/java/org/apache/tomcat/util/net/jsse/openssl/OpenSSLCipherConfigurationParser.java 2014-07-10 14:03:20 UTC (rev 2474) @@ -599,8 +599,10 @@ } static LinkedHashSet<Ciphers> parse(String expression) { - if (!initialized) { - init(); + synchronized (OpenSSLCipherConfigurationParser.class) { + if (!initialized) { + init(); + } } String[] elements = expression.split(SEPARATOR); LinkedHashSet<Ciphers> ciphers = new LinkedHashSet<Ciphers>();