You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ol...@apache.org on 2013/10/03 12:12:01 UTC
svn commit: r1528776 -
/sling/trunk/bundles/jcr/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/Loader.java
Author: olli
Date: Thu Oct 3 10:12:00 2013
New Revision: 1528776
URL: http://svn.apache.org/r1528776
Log:
SLING-2917 rename entry to pathEntry
Modified:
sling/trunk/bundles/jcr/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/Loader.java
Modified: sling/trunk/bundles/jcr/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/Loader.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/Loader.java?rev=1528776&r1=1528775&r2=1528776&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/Loader.java (original)
+++ sling/trunk/bundles/jcr/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/Loader.java Thu Oct 3 10:12:00 2013
@@ -218,9 +218,9 @@ public class Loader extends BaseImportLo
final DefaultContentCreator contentCreator = new DefaultContentCreator(this.contentLoaderService);
try {
while (pathIter.hasNext()) {
- final PathEntry entry = pathIter.next();
- if (!contentAlreadyLoaded || entry.isOverwrite()) {
- String workspace = entry.getWorkspace();
+ final PathEntry pathEntry = pathIter.next();
+ if (!contentAlreadyLoaded || pathEntry.isOverwrite()) {
+ String workspace = pathEntry.getWorkspace();
final Session targetSession;
if (workspace != null) {
if (createdSessions.containsKey(workspace)) {
@@ -233,10 +233,10 @@ public class Loader extends BaseImportLo
targetSession = defaultSession;
}
- final Node targetNode = getTargetNode(targetSession, entry.getTarget());
+ final Node targetNode = getTargetNode(targetSession, pathEntry.getTarget());
if (targetNode != null) {
- installFromPath(bundle, entry.getPath(), entry, targetNode, entry.isUninstall() ? createdNodes : null, contentCreator);
+ installFromPath(bundle, pathEntry.getPath(), pathEntry, targetNode, pathEntry.isUninstall() ? createdNodes : null, contentCreator);
}
}
}