You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2015/06/25 17:19:06 UTC
svn commit: r1687550 -
/tomcat/trunk/java/org/apache/tomcat/util/net/openssl/CipherSuiteConverter.java
Author: markt
Date: Thu Jun 25 15:19:05 2015
New Revision: 1687550
URL: http://svn.apache.org/r1687550
Log:
Fix a FindBugs issue
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/openssl/CipherSuiteConverter.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/openssl/CipherSuiteConverter.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/openssl/CipherSuiteConverter.java?rev=1687550&r1=1687549&r2=1687550&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/openssl/CipherSuiteConverter.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/openssl/CipherSuiteConverter.java Thu Jun 25 15:19:05 2015
@@ -300,11 +300,14 @@ public final class CipherSuiteConverter
final String javaCipherSuiteTls = "TLS_" + javaCipherSuiteSuffix;
// Cache the mapping.
- final Map<String, String> p2j = new HashMap<>(4);
+ Map<String, String> p2j = new HashMap<>(4);
p2j.put("", javaCipherSuiteSuffix);
p2j.put("SSL", javaCipherSuiteSsl);
p2j.put("TLS", javaCipherSuiteTls);
- o2j.putIfAbsent(openSslCipherSuite, p2j);
+ Map<String, String> p2jCurrent = o2j.putIfAbsent(openSslCipherSuite, p2j);
+ if (p2jCurrent != null) {
+ p2j = p2jCurrent;
+ }
// Cache the reverse mapping after adding the protocol prefix (TLS_ or SSL_)
j2o.putIfAbsent(javaCipherSuiteTls, openSslCipherSuite);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org