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

Issue #901 - defaulting trustStoreType to keyStoreType if unspecified

This commit is contained in:
Joakim Erdfelt 2017-10-10 09:34:57 -07:00
parent 2eca7492dd
commit ef65f083b8
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -665,16 +665,16 @@ public class SslContextFactory extends AbstractLifeCycle implements Dumpable
}
/**
* @return The type of the trust store (default "JKS")
* @return The type of the trust store (defaults to type of the key store if unspecified)
*/
@ManagedAttribute("The trustStore type")
public String getTrustStoreType()
{
return _trustStoreType;
return _trustStoreType != null ? _trustStoreType : _keyStoreType;
}
/**
* @param trustStoreType The type of the trust store (default "JKS")
* @param trustStoreType The type of the trust store
*/
public void setTrustStoreType(String trustStoreType)
{