From e3e0118b40d4036ef9739d12c7811922d375d46e Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Thu, 15 Jul 2021 10:22:45 +0200
Subject: [PATCH] Improve remove empty paragraph.

---
 .../src/org/argeo/docbook/DbkUtils.java        | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

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;
-- 
2.30.2