commit 6ac8361023ab4579066c244b961896760de73243
author Tobias Bocanegra <tripod@apache.org> Mon Oct 12 18:02:37 2015 +0000
committer Tobias Bocanegra <tripod@apache.org> Mon Oct 12 18:02:37 2015 +0000
tree 9fd329dbe74533e01d7c58a023922223253e3063
parent 6f0cdcbddd534ae7827cd598ffad0ff3b7287f21

JCRVLT-103 JcrPackageDefinitionImpl always accesses root node

git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/commons/filevault/trunk@1708184 13f79535-47bb-0310-9956-ffa450edef68

vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/impl/JcrPackageDefinitionImpl.java

diff --git a/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/impl/JcrPackageDefinitionImpl.java b/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/impl/JcrPackageDefinitionImpl.java
index 4548895..83bee22 100644
--- a/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/impl/JcrPackageDefinitionImpl.java
+++ b/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/impl/JcrPackageDefinitionImpl.java
@@ -274,7 +274,6 @@
 
         try {
             Node rootNode = session.getNode(rootPath);
-            String defPath = defNode.getPath().substring(1);
 
             Importer importer = new Importer();
             // disable saving
@@ -283,7 +282,7 @@
             importer.run(archive, rootNode);
 
             // refresh defNode if it was replaced during unwrap
-            defNode = session.getRootNode().getNode(defPath);
+            defNode = session.getNode(rootPath);
 
             // set props again
             if (lastUnpacked != null) {