| commit | 900a89ba58ba4396a7cc5cb053341a8b6bf0b592 | [log] [tgz] |
|---|---|---|
| author | Carsten Ziegeler <cziegeler@apache.org> | Wed Sep 03 14:07:42 2014 +0000 |
| committer | Carsten Ziegeler <cziegeler@apache.org> | Wed Sep 03 14:07:42 2014 +0000 |
| tree | b4c4e0b8b2b8da8a040b64cc61863b8afa2b316f | |
| parent | 13b8cc4a3efa764fadeba89bd5f4b75de364375d [diff] |
FELIX-4628 : [Jetty] Ignore empty string value for truststore. Apply patch from Dominique Pfister git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1622261 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/JettyConfig.java b/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/JettyConfig.java index 1e5571c..6f2e6ec 100644 --- a/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/JettyConfig.java +++ b/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/JettyConfig.java
@@ -304,7 +304,8 @@ public String getTruststore() { - return getProperty(FELIX_TRUSTSTORE, null); + String value = getProperty(FELIX_TRUSTSTORE, null); + return value == null || value.trim().length() == 0 ? null : value; } public String getTruststoreType()