jackrabbit-oak-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ang...@apache.org
Subject svn commit: r1506869 - /jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/ImporterImpl.java
Date Thu, 25 Jul 2013 09:55:12 GMT
Author: angela
Date: Thu Jul 25 09:55:11 2013
New Revision: 1506869

URL: http://svn.apache.org/r1506869
Log:
OAK-931 : add TODO and issue reference

Modified:
    jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/ImporterImpl.java

Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/ImporterImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/ImporterImpl.java?rev=1506869&r1=1506868&r2=1506869&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/ImporterImpl.java
(original)
+++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/ImporterImpl.java
Thu Jul 25 09:55:11 2013
@@ -111,11 +111,14 @@ public class ImporterImpl implements Imp
         }
 
         this.uuidBehavior = uuidBehavior;
+        userID = sessionContext.getSessionDelegate().getAuthInfo().getUserID();
+
         importTargetTree = root.getTree(absPath);
         if (!importTargetTree.exists()) {
             throw new PathNotFoundException(absPath);
         }
 
+        // TODO: review usage of write-root and object obtained from session-context (OAK-931)
         VersionManager vMgr = sessionContext.getVersionManager();
         if (!vMgr.isCheckedOut(absPath)) {
             throw new VersionException("Target node is checked in.");
@@ -123,13 +126,12 @@ public class ImporterImpl implements Imp
         if (sessionContext.getLockManager().isLocked(absPath)) {
             throw new LockException("Target node is locked.");
         }
-
         ntTypesRoot = root.getTree(NODE_TYPES_PATH);
-        userID = sessionContext.getSessionDelegate().getAuthInfo().getUserID();
         accessManager = sessionContext.getAccessManager();
         idManager = new IdentifierManager(root);
         effectiveNodeTypeProvider = sessionContext.getEffectiveNodeTypeProvider();
         definitionProvider = sessionContext.getDefinitionProvider();
+        // TODO: end
 
         refTracker = new ReferenceChangeTracker();
 
@@ -137,7 +139,6 @@ public class ImporterImpl implements Imp
         parents.push(importTargetTree);
 
         pItemImporters.clear();
-
         for (ProtectedItemImporter importer : sessionContext.getProtectedItemImporters())
{
             if (importer.init(sessionContext.getSession(), root, sessionContext, isWorkspaceImport,
uuidBehavior, refTracker)) {
                 pItemImporters.add(importer);



Mime
View raw message