Author: remy.maucherat(a)jboss.com Date: 2014-06-30 10:12:36 -0400 (Mon, 30 Jun 2014) New Revision: 2469 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: More for BZ1078204: Use of + would empty the ciphers list. Submitted by Kabir Khan. 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-06-27 12:11:05 UTC (rev 2468) +++ branches/7.4.x/src/main/java/org/apache/tomcat/util/net/jsse/openssl/OpenSSLCipherConfigurationParser.java 2014-06-30 14:12:36 UTC (rev 2469) @@ -630,7 +630,7 @@ } else if (element.contains(AND)) { String[] intersections = element.split("\\" + AND); if(intersections.length > 0) { - List<Ciphers> result = aliases.get(intersections[0]); + List<Ciphers> result = new ArrayList<Ciphers>(aliases.get(intersections[0])); for(int i = 1; i < intersections.length; i++) { if(aliases.containsKey(intersections[i])) { result.retainAll(aliases.get(intersections[i])); 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-06-27 12:11:05 UTC (rev 2468) +++ branches/7.5.x/src/main/java/org/apache/tomcat/util/net/jsse/openssl/OpenSSLCipherConfigurationParser.java 2014-06-30 14:12:36 UTC (rev 2469) @@ -30,6 +30,7 @@ import java.util.List; import java.util.Map; import java.util.Set; + import org.apache.tomcat.util.net.jsse.JSSELogger; /** @@ -630,7 +631,7 @@ } else if (element.contains(AND)) { String[] intersections = element.split("\\" + AND); if(intersections.length > 0) { - List<Ciphers> result = aliases.get(intersections[0]); + List<Ciphers> result = new ArrayList<Ciphers>(aliases.get(intersections[0])); for(int i = 1; i < intersections.length; i++) { if(aliases.containsKey(intersections[i])) { result.retainAll(aliases.get(intersections[i]));