X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=core%2Forg.argeo.suite.core%2Fsrc%2Forg%2Fargeo%2Fsuite%2Fcore%2FCustomMaintenanceService.java;h=5d76eb126ae5ec4c83cf21d7de33316e385d9c88;hb=752a7b2614895002a3d184be166ef4162caf0d05;hp=b6e997af2d1508380f02f047afd9526511c7959d;hpb=418ea1efbf3f0d6b706603c6ff1c0fdd17314773;p=gpl%2Fargeo-suite.git diff --git a/core/org.argeo.suite.core/src/org/argeo/suite/core/CustomMaintenanceService.java b/core/org.argeo.suite.core/src/org/argeo/suite/core/CustomMaintenanceService.java index b6e997a..5d76eb1 100644 --- a/core/org.argeo.suite.core/src/org/argeo/suite/core/CustomMaintenanceService.java +++ b/core/org.argeo.suite.core/src/org/argeo/suite/core/CustomMaintenanceService.java @@ -36,14 +36,15 @@ public abstract class CustomMaintenanceService extends AbstractMaintenanceServic for (String terms : typologies) { loadTerms(termsBase, terms); } + // TODO do not save here, so that upper layers can decide when to save termsBase.getSession().save(); } } protected void loadTerms(Node termsBase, String name) throws IOException, RepositoryException { try { - if (termsBase.hasNode(name)) - return; +// if (termsBase.hasNode(name)) +// return; String termsLoadPath = getTypologiesLoadBase() + '/' + name + ".xml"; URL termsUrl = getClass().getClassLoader().getResource(termsLoadPath); @@ -62,6 +63,7 @@ public abstract class CustomMaintenanceService extends AbstractMaintenanceServic } if (log.isDebugEnabled()) log.debug("Terms '" + name + "' loaded."); + // TODO do not save here, so that upper layers can decide when to save termsBase.getSession().save(); } catch (RepositoryException | IOException e) { log.error("Cannot load terms '" + name + "': " + e.getMessage());