You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by st...@apache.org on 2014/06/04 11:49:45 UTC

svn commit: r1600070 - /sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/GenericJcrRootFile.java

Author: stefanegli
Date: Wed Jun  4 09:49:45 2014
New Revision: 1600070

URL: http://svn.apache.org/r1600070
Log:
SLING-3639 : avoid NEP with grandparent/_jcr_content/.content.xml case 

Modified:
    sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/GenericJcrRootFile.java

Modified: sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/GenericJcrRootFile.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/GenericJcrRootFile.java?rev=1600070&r1=1600069&r2=1600070&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/GenericJcrRootFile.java (original)
+++ sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/GenericJcrRootFile.java Wed Jun  4 09:49:45 2014
@@ -94,8 +94,12 @@ public class GenericJcrRootFile extends 
 				DirNode dirNodeParent = (DirNode)parent;
 				JcrNode dirNodeParentParent = dirNodeParent.getParent();
 				JcrNode effectiveSibling = dirNodeParent.getEffectiveSibling();
-				effectiveSibling.dirSibling = dirNodeParent;
-				handleProperties(element, effectiveSibling.properties);
+				if (effectiveSibling!=null) {
+				    effectiveSibling.dirSibling = dirNodeParent;
+				    handleProperties(element, effectiveSibling.properties);
+				} else {
+				    handleProperties(element, parent.properties);
+				}
 				effectiveParent = parent;
 				dirNodeParentParent.hide(parent);
 			} else {