Author: aogburn Date: 2014-05-30 10:36:37 -0400 (Fri, 30 May 2014) New Revision: 2434 Modified: branches/JBOSSWEB_7_3_1_FINAL_BZ-1103019/src/main/java/org/apache/tomcat/util/net/jsse/JSSESupport.java Log: [BZ-1103019] merge fix Modified: branches/JBOSSWEB_7_3_1_FINAL_BZ-1103019/src/main/java/org/apache/tomcat/util/net/jsse/JSSESupport.java =================================================================== --- branches/JBOSSWEB_7_3_1_FINAL_BZ-1103019/src/main/java/org/apache/tomcat/util/net/jsse/JSSESupport.java 2014-05-30 13:30:50 UTC (rev 2433) +++ branches/JBOSSWEB_7_3_1_FINAL_BZ-1103019/src/main/java/org/apache/tomcat/util/net/jsse/JSSESupport.java 2014-05-30 14:36:37 UTC (rev 2434) @@ -205,7 +205,12 @@ SSLSupport.CipherData c_aux[]=ciphers; if (session == null) return null; - Integer keySize = (Integer) keySizeCache.get(session); + + Integer keySize = null; + synchronized(keySizeCache) { + keySize = keySizeCache.get(session); + } + if (keySize == null) { int size = 0; String cipherSuite = session.getCipherSuite(); @@ -216,7 +221,9 @@ } } keySize = new Integer(size); - keySizeCache.put(session, keySize); + synchronized(keySizeCache) { + keySizeCache.put(session, keySize); + } } return keySize; } Property changes on: branches/JBOSSWEB_7_3_1_FINAL_BZ-1103019/src/main/java/org/apache/tomcat/util/net/jsse/JSSESupport.java ___________________________________________________________________ Added: svn:mergeinfo + /branches/7.3.x/src/main/java/org/apache/tomcat/util/net/jsse/JSSESupport.java:2431