Make settings XML text for robust.

[lgpl/argeo-commons.git] / org.argeo.jcr / src / org / argeo / jcr / JcrxApi.java

diff --git a/org.argeo.jcr/src/org/argeo/jcr/JcrxApi.java b/org.argeo.jcr/src/org/argeo/jcr/JcrxApi.java
index e35495da5a22d875a711aa423d9c2baa944d51fd..0223b69444a94054564603947bc4e178e438ae93 100644 (file)
--- a/org.argeo.jcr/src/org/argeo/jcr/JcrxApi.java
+++ b/org.argeo.jcr/src/org/argeo/jcr/JcrxApi.java
@@ -37,7 +37,7 @@ public class JcrxApi {
                        if (!node.hasNode(name))
                                return null;
                        Node child = node.getNode(name);
-                       if (child.hasNode(Jcr.JCR_XMLTEXT))
+                       if (!child.hasNode(Jcr.JCR_XMLTEXT))
                                return null;
                        Node xmlText = child.getNode(Jcr.JCR_XMLTEXT);
                        if (!xmlText.hasProperty(Jcr.JCR_XMLCHARACTERS))
@@ -54,9 +54,12 @@ public class JcrxApi {
         */
        public static void setXmlValue(Node node, String name, String value) {
                try {
-                       if (node.hasNode(name))
-                               node.getNode(name).getNode(Jcr.JCR_XMLTEXT).setProperty(Jcr.JCR_XMLCHARACTERS, value);
-                       else
+                       if (node.hasNode(name)) {
+                               Node child = node.getNode(name);
+                               if (!child.hasNode(Jcr.JCR_XMLTEXT))
+                                       child.addNode(Jcr.JCR_XMLTEXT, JcrxType.JCRX_XMLTEXT);
+                               child.getNode(Jcr.JCR_XMLTEXT).setProperty(Jcr.JCR_XMLCHARACTERS, value);
+                       } else
                                node.addNode(name, JcrxType.JCRX_XMLVALUE).addNode(Jcr.JCR_XMLTEXT, JcrxType.JCRX_XMLTEXT)
                                                .setProperty(Jcr.JCR_XMLCHARACTERS, value);
                } catch (RepositoryException e) {