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

[chetanm]

Author: chetanm
Date: Mon Jan  4 08:59:17 2016
New Revision: 1722803

URL: http://svn.apache.org/viewvc?rev=1722803&view=rev
Log:
Revert changes made in r1722496

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=1722803&r1=1722802&r2=1722803&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
 Mon Jan  4 08:59:17 2016
@@ -482,11 +482,13 @@ public class ImporterImpl implements Imp
             if (pnImporter != null) {
                 pnImporter.endChildInfo();
             }
-        } 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;
+        } 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;
+            }
         }
 
         idLookup.rememberImportedUUIDs(parent);