svn commit: r1722496 - /jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/ImporterImpl.java

[dbrosius]

Author: dbrosius
Date: Fri Jan  1 14:26:15 2016
New Revision: 1722496

URL: http://svn.apache.org/viewvc?rev=1722496&view=rev
Log:
short-circuit end node processing if the active importer is null

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=1722496&r1=1722495&r2=1722496&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
 Fri Jan  1 14:26:15 2016
@@ -482,13 +482,11 @@ public class ImporterImpl implements Imp
             if (pnImporter != null) {
                 pnImporter.endChildInfo();
             }
-        } else if (getDefinition(parent).isProtected()) {
-            if (pnImporter != null) {
-                pnImporter.end(parent);
-                // and reset the pnImporter field waiting for the next 
protected
-                // parent -> selecting again from available importers
-                pnImporter = null;
-            }
+        } else if ((pnImporter != null) && 
getDefinition(parent).isProtected()) {
+            pnImporter.end(parent);
+            // and reset the pnImporter field waiting for the next protected
+            // parent -> selecting again from available importers
+            pnImporter = null;
         }
 
         idLookup.rememberImportedUUIDs(parent);