Index: vault-core/src/main/java/org/apache/jackrabbit/vault/fs/io/Importer.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- vault-core/src/main/java/org/apache/jackrabbit/vault/fs/io/Importer.java	(revision 1638065)
+++ vault-core/src/main/java/org/apache/jackrabbit/vault/fs/io/Importer.java	(revision )
@@ -1113,25 +1113,20 @@
         }
 
         public Node getParentNode(Session s) throws RepositoryException {
-            Node root = s.getRootNode();
-            String parentPath = Text.getRelativeParent(path, 1);
-            if (parentPath.length() > 0 && !parentPath.equals("/")) {
-                parentPath = parentPath.substring(1);
-                if (root.hasNode(parentPath)) {
-                    root = root.getNode(parentPath);
+            Node parentNode;
+            String parentPath = emptyPathToRoot(Text.getRelativeParent(path, 1));
+            if (s.nodeExists(parentPath)) {
+                parentNode = s.getNode(parentPath);
-                } else {
+            } else {
-                    root = null;
+                parentNode = null;
-                }
+            }
+            return parentNode;
-            }
+        }
-            return root;
-        }
 
         public Node getNode(Session s) throws RepositoryException {
-            if (path.length() == 0) {
-                return s.getRootNode();
-            }
-            return s.nodeExists(path)
-                    ? s.getNode(path)
+            String p = emptyPathToRoot(path);
+            return s.nodeExists(p)
+                    ? s.getNode(p)
                     : null;
         }
 
@@ -1189,6 +1184,10 @@
             }
 
             return ret;
+        }
+
+        private static String emptyPathToRoot(String p) {
+            return (p.isEmpty()) ? "/" : p;
         }
     }
 
\ No newline at end of file
