From feb53786a7c262730b5be0ea604983bca2ce3ecb Mon Sep 17 00:00:00 2001 From: nik Date: Wed, 7 Nov 2012 20:20:53 +0400 Subject: [PATCH] EA-40271 - NPE: LayoutTree.findCompositeNodeByPath --- .../roots/ui/configuration/artifacts/LayoutTree.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/LayoutTree.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/LayoutTree.java index fba29f988038..9ac88ac60f82 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/LayoutTree.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/LayoutTree.java @@ -24,7 +24,6 @@ import com.intellij.ide.util.treeView.AbstractTreeBuilder; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.project.ProjectBundle; -import com.intellij.openapi.roots.ui.configuration.artifacts.nodes.CompositePackagingElementNode; import com.intellij.openapi.roots.ui.configuration.artifacts.nodes.PackagingElementNode; import com.intellij.openapi.util.Pair; import com.intellij.openapi.util.text.StringUtil; @@ -179,11 +178,10 @@ public class LayoutTree extends SimpleDnDAwareTree implements AdvancedDnDSource public PackagingElementNode findCompositeNodeByPath(String parentPath) { PackagingElementNode node = getRootPackagingNode(); for (String name : StringUtil.split(parentPath, "/")) { - final CompositePackagingElementNode child = node.findCompositeChild(name); - if (child == null) { + if (node == null) { return null; } - node = child; + node = node.findCompositeChild(name); } return node; }