Author: dehort Date: 2013-10-29 14:06:11 -0400 (Tue, 29 Oct 2013) New Revision: 2296 Modified: branches/2.1.x/java/org/apache/tomcat/util/net/jsse/JSSESupport.java Log: JBPAPP-10895 - JBossWeb memory leak with using SSL + Java security manager Modified: branches/2.1.x/java/org/apache/tomcat/util/net/jsse/JSSESupport.java =================================================================== --- branches/2.1.x/java/org/apache/tomcat/util/net/jsse/JSSESupport.java 2013-10-28 13:12:01 UTC (rev 2295) +++ branches/2.1.x/java/org/apache/tomcat/util/net/jsse/JSSESupport.java 2013-10-29 18:06:11 UTC (rev 2296) @@ -23,6 +23,8 @@ import java.net.SocketException; import java.security.cert.Certificate; import java.security.cert.CertificateFactory; +import java.util.Map; +import java.util.WeakHashMap; import javax.net.ssl.HandshakeCompletedEvent; import javax.net.ssl.HandshakeCompletedListener; @@ -52,6 +54,8 @@ private static org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(JSSESupport.class); + private static final Map<SSLSession, Integer> keySizeCache = + new WeakHashMap<SSLSession, Integer>(10); protected SSLSocket ssl; protected SSLSession session; @@ -195,7 +199,7 @@ SSLSupport.CipherData c_aux[]=ciphers; if (session == null) return null; - Integer keySize = (Integer) session.getValue(KEY_SIZE_KEY); + Integer keySize = (Integer) keySizeCache.get(session); if (keySize == null) { int size = 0; String cipherSuite = session.getCipherSuite(); @@ -206,7 +210,7 @@ } } keySize = new Integer(size); - session.putValue(KEY_SIZE_KEY, keySize); + keySizeCache.put(session, keySize); } return keySize; }