X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=runtime%2Forg.argeo.slc.akb%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fakb%2Fcore%2FAkbServiceImpl.java;h=df24ef108fc427f3a24cf7f6c95ea029956d3ee7;hb=1a0e1b439c58df2f39495ed756df06ca00e384e1;hp=83de7294c8b96b0c8d7cdc49d92dcd87d8460a5b;hpb=44b4c78e6a082d51d0410c3995b5edf353d417b9;p=gpl%2Fargeo-slc.git diff --git a/runtime/org.argeo.slc.akb/src/main/java/org/argeo/slc/akb/core/AkbServiceImpl.java b/runtime/org.argeo.slc.akb/src/main/java/org/argeo/slc/akb/core/AkbServiceImpl.java index 83de7294c..df24ef108 100644 --- a/runtime/org.argeo.slc.akb/src/main/java/org/argeo/slc/akb/core/AkbServiceImpl.java +++ b/runtime/org.argeo.slc.akb/src/main/java/org/argeo/slc/akb/core/AkbServiceImpl.java @@ -114,12 +114,8 @@ public class AkbServiceImpl implements AkbService, AkbNames { throws RepositoryException { Node newTemplate = parentNode.addNode(name, AkbTypes.AKB_ENV_TEMPLATE); newTemplate.setProperty(Property.JCR_TITLE, name); - - // Node connectorParent = newTemplate.addNode(AkbTypes.AKB_CONNECTOR_FOLDER, AkbTypes.AKB_CONNECTOR_FOLDER); - // connectorParent.setProperty(Property.JCR_TITLE, connectorParentName); - return newTemplate; } @@ -140,11 +136,18 @@ public class AkbServiceImpl implements AkbService, AkbNames { NodeIterator ni = template.getNode(AkbTypes.AKB_CONNECTOR_FOLDER) .getNodes(); - while (ni.hasNext()) { + activeConns: while (ni.hasNext()) { Node currNode = ni.nextNode(); if (currNode.isNodeType(AkbTypes.AKB_CONNECTOR_ALIAS)) { + String connType = currNode.getProperty(AKB_CONNECTOR_TYPE) + .getString(); + + if (AkbJcrUtils.isEmptyString(connType)) + // Cannot create an instance if the type is undefined + continue activeConns; + Node newConnector = connectorParent.addNode(currNode.getName(), - AkbTypes.AKB_CONNECTOR); + connType); newConnector.setProperty(AKB_CONNECTOR_ALIAS_PATH, currNode.getPath()); if (copyDefaultConnectors