From 5b19818c49cd2231900cd4cbccd86bd8b20ecadd Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Tue, 20 Jun 2023 08:08:09 +0200 Subject: [PATCH] Make typologies import more robust --- .../src/org/argeo/app/jcr/CustomMaintenanceService.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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); -- 2.30.2