X-Git-Url: https://git.argeo.org/?p=gpl%2Fargeo-suite.git;a=blobdiff_plain;f=publishing%2Forg.argeo.publishing.ui%2Fsrc%2Forg%2Fargeo%2Fdocbook%2FDbkUtils.java;fp=publishing%2Forg.argeo.publishing.ui%2Fsrc%2Forg%2Fargeo%2Fdocbook%2FDbkUtils.java;h=6db73d0e5b8a28b525f00c6fac789a9a3b00ce4d;hp=b654c73178646597e50badabdbe2c6e13989a725;hb=e3e0118b40d4036ef9739d12c7811922d375d46e;hpb=5ca9fe2072f1084df0d0c3771bf7ca325cabcdc1 diff --git a/publishing/org.argeo.publishing.ui/src/org/argeo/docbook/DbkUtils.java b/publishing/org.argeo.publishing.ui/src/org/argeo/docbook/DbkUtils.java index b654c73..6db73d0 100644 --- a/publishing/org.argeo.publishing.ui/src/org/argeo/docbook/DbkUtils.java +++ b/publishing/org.argeo.publishing.ui/src/org/argeo/docbook/DbkUtils.java @@ -115,15 +115,21 @@ public class DbkUtils { try { if (isDbk(node, DbkType.para)) { NodeIterator nit = node.getNodes(); - if (!nit.hasNext()) - return false;// log this unexpected situation? + if (!nit.hasNext()) { + node.remove(); + return true; + } Node first = nit.nextNode(); if (nit.hasNext()) return false; - String str = JcrxApi.getXmlValue(first); - if (str != null && str.trim().equals("")) { - node.remove(); - return true; + if (first.getName().equals(Jcr.JCR_XMLTEXT)) { + String str = JcrxApi.getXmlValue(first); + if (str != null && str.trim().equals("")) { + node.remove(); + return true; + } + } else { + return false; } } return false;