Skip to content

Commit 51b10d1

Browse files
committed
refactor VersionServiceImpl::createVersion
1 parent b3c1a14 commit 51b10d1

File tree

1 file changed

+3
-6
lines changed

1 file changed

+3
-6
lines changed

app/aem/core/src/main/java/com/cognifide/apm/core/services/version/VersionServiceImpl.java

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import com.cognifide.apm.core.grammar.ReferenceFinder;
2626
import com.cognifide.apm.core.grammar.ScriptExecutionException;
2727
import com.cognifide.apm.core.scripts.MutableScriptWrapper;
28-
import com.cognifide.apm.core.scripts.ScriptNode;
2928
import com.day.cq.commons.jcr.JcrUtil;
3029
import com.day.crx.JcrConstants;
3130
import java.util.List;
@@ -112,15 +111,14 @@ private void createVersion(ResourceResolver resolver, Script script) {
112111
Node versionNode = createVersionNode(scriptNode, script, session);
113112
copyScriptContent(versionNode, script, session);
114113
session.save();
115-
resolver.commit();
116114
} catch (Exception e) {
117115
LOGGER.error("Issues with saving to repository while logging script execution", e);
118116
}
119117
}
120118

121119
private Node createScriptNode(Script script, Session session) throws RepositoryException {
122120
String path = getScriptVersionPath(script);
123-
Node scriptHistory = JcrUtils.getOrCreateByPath(path, "sling:OrderedFolder", JcrConstants.NT_UNSTRUCTURED, session, true);
121+
Node scriptHistory = JcrUtils.getOrCreateByPath(path, "sling:OrderedFolder", JcrConstants.NT_UNSTRUCTURED, session, false);
124122
scriptHistory.setProperty("scriptPath", script.getPath());
125123
scriptHistory.setProperty("lastChecksum", script.getChecksum());
126124
return scriptHistory;
@@ -132,14 +130,13 @@ private String getScriptVersionPath(Script script) {
132130

133131
private Node createVersionNode(Node parent, Script script, Session session) throws RepositoryException {
134132
String path = parent.getPath() + "/" + script.getChecksum();
135-
return JcrUtils.getOrCreateByPath(path, "sling:OrderedFolder", "sling:OrderedFolder", session, true);
133+
return JcrUtils.getOrCreateByPath(path, "sling:OrderedFolder", "sling:OrderedFolder", session, false);
136134
}
137135

138136
private void copyScriptContent(Node parent, Script script, Session session) throws RepositoryException {
139137
if (!parent.hasNode(SCRIPT_NODE_NAME)) {
140138
Node source = session.getNode(script.getPath());
141-
Node file = JcrUtil.copy(source, parent, SCRIPT_NODE_NAME);
142-
file.addMixin(ScriptNode.APM_SCRIPT);
139+
JcrUtil.copy(source, parent, SCRIPT_NODE_NAME);
143140
}
144141
}
145142

0 commit comments

Comments
 (0)