Merge pull request #144 from shabanovd/develop

fix getPropertyMap code (it always return null)
eXist-db · Feb 6, 2014 · e44003e · e44003e
2 parents e70c01a + 8fc5b93
commit e44003e
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/src/org/exist/config/ConfigurationImpl.java b/src/org/exist/config/ConfigurationImpl.java
@@ -138,6 +138,7 @@ private void cache() {
                         }
                     } else {
                         props.put(name, child.getNodeValue());
+                        names.add(name);
                     }
                 }
             }
@@ -190,10 +191,12 @@ public String getProperty(String name, String default_property) {
 
     @Override
     public Map<String, String> getPropertyMap(String name) {
-        if (props.containsKey(name))
-            return null;
-
         final Map<String, String> map = new HashMap<String, String>();
+
+        if (hasProperty(name)) {
+            map.put(name, getProperty(name));
+            return map;
+        }
 
         Node child = getFirstChild();
         while (child != null) {