You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@felix.apache.org by cz...@apache.org on 2014/09/03 16:07:43 UTC

svn commit: r1622261 - /felix/trunk/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/JettyConfig.java

Author: cziegeler
Date: Wed Sep  3 14:07:42 2014
New Revision: 1622261

URL: http://svn.apache.org/r1622261
Log:
FELIX-4628 : [Jetty] Ignore empty string value for truststore. Apply patch from Dominique Pfister

Modified:
    felix/trunk/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/JettyConfig.java

Modified: felix/trunk/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/JettyConfig.java
URL: http://svn.apache.org/viewvc/felix/trunk/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/JettyConfig.java?rev=1622261&r1=1622260&r2=1622261&view=diff
==============================================================================
--- felix/trunk/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/JettyConfig.java (original)
+++ felix/trunk/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/JettyConfig.java Wed Sep  3 14:07:42 2014
@@ -304,7 +304,8 @@ public final class JettyConfig
 
     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()