From 5a8ed8b556812dd13ab02ffbe5876c6676313cf3 Mon Sep 17 00:00:00 2001
From: Anton Makeev <Anton.Makeev@jetbrains.com>
Date: Tue, 28 Sep 2010 15:45:32 +0400
Subject: [PATCH] maven: npe fix in dom

---
 .../converters/MavenParentRelativePathConverter.java  | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/converters/MavenParentRelativePathConverter.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/converters/MavenParentRelativePathConverter.java
index 0a09e76432c7..9f50e885873f 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/converters/MavenParentRelativePathConverter.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/converters/MavenParentRelativePathConverter.java
@@ -46,7 +46,10 @@ public class MavenParentRelativePathConverter extends ResolvingConverter<PsiFile
   public PsiFile fromString(@Nullable @NonNls String s, ConvertContext context) {
     if (s == null) return null;
 
-    VirtualFile f = context.getFile().getVirtualFile().getParent().findFileByRelativePath(s);
+    VirtualFile contextFile = context.getFile().getVirtualFile();
+    if (contextFile == null) return null;
+
+    VirtualFile f = contextFile.getParent().findFileByRelativePath(s);
     if (f == null) return null;
 
     if (f.isDirectory()) f = f.findFileByRelativePath(MavenConstants.POM_XML);
@@ -58,9 +61,9 @@ public class MavenParentRelativePathConverter extends ResolvingConverter<PsiFile
   @Override
   public String toString(@Nullable PsiFile f, ConvertContext context) {
     if (f == null) return null;
-    PsiFile currentPsiFile = context.getFile().getOriginalFile();
-    if (currentPsiFile == null) currentPsiFile = context.getFile();
-    VirtualFile currentFile = currentPsiFile.getVirtualFile();
+    VirtualFile currentFile = context.getFile().getOriginalFile().getVirtualFile();
+    if (currentFile == null) return null;
+
     return MavenDomUtil.calcRelativePath(currentFile.getParent(), f.getVirtualFile());
   }