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 ab34c730ee5d3382dba35b083ad4b8928caa359e..0223b69444a94054564603947bc4e178e438ae93 100644 (file)
--- a/org.argeo.jcr/src/org/argeo/jcr/JcrxApi.java
+++ b/org.argeo.jcr/src/org/argeo/jcr/JcrxApi.java
@@ -35,8 +35,15 @@ public class JcrxApi {
        public static String getXmlValue(Node node, String name) {
                try {
                        if (!node.hasNode(name))
-                               throw new IllegalArgumentException("No XML text named " + name);
-                       return node.getNode(name).getNode(Jcr.JCR_XMLTEXT).getProperty(Jcr.JCR_XMLCHARACTERS).getString();
+                               return null;
+                       Node child = node.getNode(name);
+                       if (!child.hasNode(Jcr.JCR_XMLTEXT))
+                               return null;
+                       Node xmlText = child.getNode(Jcr.JCR_XMLTEXT);
+                       if (!xmlText.hasProperty(Jcr.JCR_XMLCHARACTERS))
+                               throw new IllegalArgumentException(
+                                               "Node " + xmlText + " has no " + Jcr.JCR_XMLCHARACTERS + " property");
+                       return xmlText.getProperty(Jcr.JCR_XMLCHARACTERS).getString();
                } catch (RepositoryException e) {
                        throw new IllegalStateException("Cannot get " + name + " as XML text", e);
                }
@@ -47,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) {