From f3dc6d77e92f77eed4f90e77f380472d952d64ff Mon Sep 17 00:00:00 2001 From: Konstantin Bulenkov Date: Mon, 6 Feb 2012 15:21:55 +0100 Subject: [PATCH] NPE fix --- .../com/intellij/ide/util/treeView/AbstractTreeUi.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/platform/platform-api/src/com/intellij/ide/util/treeView/AbstractTreeUi.java b/platform/platform-api/src/com/intellij/ide/util/treeView/AbstractTreeUi.java index 2e21403db49b..b892cd36e489 100644 --- a/platform/platform-api/src/com/intellij/ide/util/treeView/AbstractTreeUi.java +++ b/platform/platform-api/src/com/intellij/ide/util/treeView/AbstractTreeUi.java @@ -4811,9 +4811,13 @@ public class AbstractTreeUi { public boolean isInStructure(@Nullable Object element) { Object eachParent = element; + final AbstractTreeStructure structure = getTreeStructure(); + + if (structure == null) return false; + while (eachParent != null) { - if (getTreeStructure().getRootElement().equals(eachParent)) return true; - eachParent = getTreeStructure().getParentElement(eachParent); + if (Comparing.equal(structure.getRootElement(), eachParent)) return true; + eachParent = structure.getParentElement(eachParent); } return false;