Skip to content

Commit 3596774

Browse files
committed
Merge branch 'master' into add-data-source-support
2 parents d54fb11 + 51b10d1 commit 3596774

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
@@ -26,7 +26,6 @@
2626
import com.cognifide.apm.core.grammar.ScriptExecutionException;
2727
import com.cognifide.apm.core.grammar.datasource.DataSourceInvoker;
2828
import com.cognifide.apm.core.scripts.MutableScriptWrapper;
29-
import com.cognifide.apm.core.scripts.ScriptNode;
3029
import com.day.cq.commons.jcr.JcrUtil;
3130
import com.day.crx.JcrConstants;
3231
import java.util.List;
@@ -116,15 +115,14 @@ private void createVersion(ResourceResolver resolver, Script script) {
116115
Node versionNode = createVersionNode(scriptNode, script, session);
117116
copyScriptContent(versionNode, script, session);
118117
session.save();
119-
resolver.commit();
120118
} catch (Exception e) {
121119
LOGGER.error("Issues with saving to repository while logging script execution", e);
122120
}
123121
}
124122

125123
private Node createScriptNode(Script script, Session session) throws RepositoryException {
126124
String path = getScriptVersionPath(script);
127-
Node scriptHistory = JcrUtils.getOrCreateByPath(path, "sling:OrderedFolder", JcrConstants.NT_UNSTRUCTURED, session, true);
125+
Node scriptHistory = JcrUtils.getOrCreateByPath(path, "sling:OrderedFolder", JcrConstants.NT_UNSTRUCTURED, session, false);
128126
scriptHistory.setProperty("scriptPath", script.getPath());
129127
scriptHistory.setProperty("lastChecksum", script.getChecksum());
130128
return scriptHistory;
@@ -136,14 +134,13 @@ private String getScriptVersionPath(Script script) {
136134

137135
private Node createVersionNode(Node parent, Script script, Session session) throws RepositoryException {
138136
String path = parent.getPath() + "/" + script.getChecksum();
139-
return JcrUtils.getOrCreateByPath(path, "sling:OrderedFolder", "sling:OrderedFolder", session, true);
137+
return JcrUtils.getOrCreateByPath(path, "sling:OrderedFolder", "sling:OrderedFolder", session, false);
140138
}
141139

142140
private void copyScriptContent(Node parent, Script script, Session session) throws RepositoryException {
143141
if (!parent.hasNode(SCRIPT_NODE_NAME)) {
144142
Node source = session.getNode(script.getPath());
145-
Node file = JcrUtil.copy(source, parent, SCRIPT_NODE_NAME);
146-
file.addMixin(ScriptNode.APM_SCRIPT);
143+
JcrUtil.copy(source, parent, SCRIPT_NODE_NAME);
147144
}
148145
}
149146

0 commit comments

Comments
 (0)