felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pde...@apache.org
Subject svn commit: r1768403 - /felix/trunk/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/Configurable.java
Date Sun, 06 Nov 2016 23:07:28 GMT
Author: pderop
Date: Sun Nov  6 23:07:27 2016
New Revision: 1768403

URL: http://svn.apache.org/viewvc?rev=1768403&view=rev
Log:
FELIX-5401: Can't override default configuration type map value using an empty map.

Modified:
    felix/trunk/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/Configurable.java

Modified: felix/trunk/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/Configurable.java
URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/Configurable.java?rev=1768403&r1=1768402&r2=1768403&view=diff
==============================================================================
--- felix/trunk/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/Configurable.java
(original)
+++ felix/trunk/dependencymanager/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/Configurable.java
Sun Nov  6 23:07:27 2016
@@ -429,7 +429,9 @@ public final class Configurable {
                 }
                 for (String entry : str.split("\\s*,\\s*")) {
                     String[] pair = entry.split("\\s*\\.\\s*", 2);
-                    result.put(pair[0], pair[1]);
+                    if (pair.length == 2) {
+                    	result.put(pair[0], pair[1]);
+                    }
                 }
             }
 



Mime
View raw message