Fixing issue where superfluous sub-elements where created.

kartobi · Jan 2, 2014 · 743ac6d · 743ac6d
1 parent 624e918
commit 743ac6d
Showing 1 changed file with 21 additions and 19 deletions.
diff --git a/src-setup/org/opencms/setup/xml/CmsSetupXmlHelper.java b/src-setup/org/opencms/setup/xml/CmsSetupXmlHelper.java
@@ -319,25 +319,27 @@ private static Element handleNode(Element parent, String xpathName) {
                 handleNode(elem, childrenPart);
                 return elem;
             }
-            Map<String, String> children = CmsStringUtil.splitAsMap(childrenPart, "][", "=");
-            // handle child nodes
-            for (Map.Entry<String, String> child : children.entrySet()) {
-                String childName = child.getKey();
-                String childValue = child.getValue();
-                if (childValue.startsWith("'")) {
-                    childValue = childValue.substring(1);
-                }
-                if (childValue.endsWith("'")) {
-                    childValue = childValue.substring(0, childValue.length() - 1);
-                }
-                if (childName.startsWith("@")) {
-                    elem.addAttribute(childName.substring(1), childValue);
-                } else if (childName.equals("text()")) {
-                    elem.setText(childValue);
-                } else if (!childName.contains("(")) {
-                    Element childElem = elem.addElement(childName);
-                    if (CmsStringUtil.isNotEmptyOrWhitespaceOnly(childValue)) {
-                        childElem.addText(childValue);
+            if (childrenPart.contains("=")) {
+                Map<String, String> children = CmsStringUtil.splitAsMap(childrenPart, "][", "=");
+                // handle child nodes
+                for (Map.Entry<String, String> child : children.entrySet()) {
+                    String childName = child.getKey();
+                    String childValue = child.getValue();
+                    if (childValue.startsWith("'")) {
+                        childValue = childValue.substring(1);
+                    }
+                    if (childValue.endsWith("'")) {
+                        childValue = childValue.substring(0, childValue.length() - 1);
+                    }
+                    if (childName.startsWith("@")) {
+                        elem.addAttribute(childName.substring(1), childValue);
+                    } else if (childName.equals("text()")) {
+                        elem.setText(childValue);
+                    } else if (!childName.contains("(")) {
+                        Element childElem = elem.addElement(childName);
+                        if (CmsStringUtil.isNotEmptyOrWhitespaceOnly(childValue)) {
+                            childElem.addText(childValue);
+                        }
                     }
                 }
             }