From cd98935bbeeaf475bc55d76491178c6bba760327 Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Wed, 27 Jan 2016 14:30:21 +0300
Subject: [PATCH] EA-78178 - NPE: DirectoryNode.getDirName

---
 .../packageDependencies/ui/DirectoryNode.java      | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/packageDependencies/ui/DirectoryNode.java b/platform/lang-impl/src/com/intellij/packageDependencies/ui/DirectoryNode.java
index 6168269d7d98..a3306dd57c87 100644
--- a/platform/lang-impl/src/com/intellij/packageDependencies/ui/DirectoryNode.java
+++ b/platform/lang-impl/src/com/intellij/packageDependencies/ui/DirectoryNode.java
@@ -148,16 +148,22 @@ public class DirectoryNode extends PackageDependenciesNode {
 
   public String toString() {
     if (myFQName != null) return myFQName;
-    if (myCompactPackages && myCompactedDirNode != null) {
-      return myDirName + "/" + myCompactedDirNode.getDirName();
+    if (myCompactPackages) {
+      final DirectoryNode compactedDirNode = myCompactedDirNode;
+      if (compactedDirNode != null) {
+        return myDirName + "/" + compactedDirNode.getDirName();
+      }
     }
     return myDirName;
   }
 
   public String getDirName() {
     if (myVDirectory == null || !myVDirectory.isValid()) return "";
-    if (myCompactPackages && myCompactedDirNode != null) {
-      return myVDirectory.getName() + "/" + myCompactedDirNode.getDirName();
+    if (myCompactPackages) {
+      final DirectoryNode compactedDirNode = myCompactedDirNode;
+      if (compactedDirNode != null) {
+        return myVDirectory.getName() + "/" + compactedDirNode.getDirName();
+      }
     }
     return myDirName;
   }