Author: remy.maucherat(a)jboss.com
Date: 2014-08-26 10:30:34 -0400 (Tue, 26 Aug 2014)
New Revision: 2496
Modified:
branches/7.5.x/src/main/java/org/apache/catalina/connector/Connector.java
branches/7.5.x/src/main/java/org/apache/tomcat/util/net/jsse/openssl/OpenSSLCipherConfigurationParser.java
Log:
BZ961257: Full sync of the protocol handler init, to avoid SSL init issues. Remove now
useless sync for OpenSSL syntax parsing.
Modified: branches/7.5.x/src/main/java/org/apache/catalina/connector/Connector.java
===================================================================
--- branches/7.5.x/src/main/java/org/apache/catalina/connector/Connector.java 2014-08-26
14:05:30 UTC (rev 2495)
+++ branches/7.5.x/src/main/java/org/apache/catalina/connector/Connector.java 2014-08-26
14:30:34 UTC (rev 2496)
@@ -982,7 +982,9 @@
System.getProperty("catalina.base"));
try {
- protocolHandler.init();
+ synchronized (Connector.class) {
+ protocolHandler.init();
+ }
} catch (Exception e) {
throw new LifecycleException(MESSAGES.protocolHandlerInitFailed(e));
}
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-08-26
14:05:30 UTC (rev 2495)
+++
branches/7.5.x/src/main/java/org/apache/tomcat/util/net/jsse/openssl/OpenSSLCipherConfigurationParser.java 2014-08-26
14:30:34 UTC (rev 2496)
@@ -599,10 +599,8 @@
}
static LinkedHashSet<Ciphers> parse(String expression) {
- synchronized (OpenSSLCipherConfigurationParser.class) {
- if (!initialized) {
- init();
- }
+ if (!initialized) {
+ init();
}
String[] elements = expression.split(SEPARATOR);
LinkedHashSet<Ciphers> ciphers = new LinkedHashSet<Ciphers>();
Show replies by date