From: Mathieu Baudier <mbaudier@argeo.org>
Date: Tue, 20 Jun 2023 06:08:09 +0000 (+0200)
Subject: Make typologies import more robust
X-Git-Tag: v2.3.15~12
X-Git-Url: http://git.argeo.org/?p=gpl%2Fargeo-suite.git;a=commitdiff_plain;h=5b19818c49cd2231900cd4cbccd86bd8b20ecadd

Make typologies import more robust
---

diff --git a/org.argeo.app.jcr/src/org/argeo/app/jcr/CustomMaintenanceService.java b/org.argeo.app.jcr/src/org/argeo/app/jcr/CustomMaintenanceService.java
index 9bb72de..7fd9d2e 100644
--- a/org.argeo.app.jcr/src/org/argeo/app/jcr/CustomMaintenanceService.java
+++ b/org.argeo.app.jcr/src/org/argeo/app/jcr/CustomMaintenanceService.java
@@ -56,7 +56,8 @@ public abstract class CustomMaintenanceService extends AbstractMaintenanceServic
 						ImportUUIDBehavior.IMPORT_UUID_COLLISION_REPLACE_EXISTING);
 			} catch (ItemExistsException e) {
 				log.warn("Terms " + name + " exists with another UUID, removing it...");
-				termsBase.getNode(name).remove();
+				if (termsBase.hasNode(name))
+					termsBase.getNode(name).remove();
 				try (InputStream in = termsUrl.openStream()) {
 					termsBase.getSession().importXML(termsBase.getPath(), in,
 							ImportUUIDBehavior.IMPORT_UUID_COLLISION_REPLACE_EXISTING);