Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

464528 NPE protection in getIncludedCipher suites

This commit is contained in:
Greg Wilkins 2015-04-21 17:49:20 +10:00
parent 1a2e625ae8
commit a293967287
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
jetty-util/src/main/java/org/eclipse/jetty/util/ssl/SslContextFactory.java
View File

@ -118,7 +118,7 @@ public class SslContextFactory extends AbstractLifeCycle
/** Excluded cipher suites. */
private final Set<String> _excludeCipherSuites = new LinkedHashSet<>();
/** Included cipher suites. */
private List<String> _includeCipherSuites = null;
private final List<String> _includeCipherSuites = new CopyOnWriteArrayList<String>();
/** Keystore path. */
private Resource _keyStoreResource;
@ -428,7 +428,8 @@ public class SslContextFactory extends AbstractLifeCycle
public void setIncludeCipherSuites(String... cipherSuites)
{
checkNotStarted();
_includeCipherSuites = new CopyOnWriteArrayList<>(Arrays.asList(cipherSuites));
_includeCipherSuites.clear();
_includeCipherSuites.addAll(Arrays.asList(cipherSuites));
}
/**
@ -1048,7 +1049,7 @@ public class SslContextFactory extends AbstractLifeCycle
List<String> selected_ciphers = new CopyOnWriteArrayList<>(); // TODO is this the most efficient?
// Set the starting ciphers - either from the included or enabled list
if (_includeCipherSuites!=null)
if (_includeCipherSuites.size()>0)
processIncludeCipherSuites(supportedCipherSuites, selected_ciphers);
else
selected_ciphers.addAll(Arrays.asList(enabledCipherSuites));