[FIXED JENKINS-8525] NPE during in parsing POMs for Multi Module Build

Originally-Committed-As: be09ca67a6237cd176dd9e8562ae86adb85a38f0
jenkinsci · Feb 21, 2011 · 337b872 · 337b872
1 parent e3fcbbb
commit 337b872
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/main/java/hudson/maven/MavenModuleSetBuild.java b/src/main/java/hudson/maven/MavenModuleSetBuild.java
@@ -1209,9 +1209,11 @@ public List<PomInfo> invoke(File ws, VirtualChannel channel) throws IOException
         private void toPomInfo(MavenProject mp, PomInfo parent, Map<String,MavenProject> abslPath, Set<PomInfo> infos) throws IOException {
 
             String relPath = PathTool.getRelativeFilePath( this.moduleRootPath, mp.getBasedir().getPath() );
-                //PathTool.getRelativeFilePath( this.workspaceProper, mp.getBasedir().getPath() );
-            relPath = FilenameUtils.normalize( relPath );
 
+            // JENKINS-8525 FilenameUtils.normalize for ../foo returns null 
+            if (!StringUtils.startsWith( relPath, "../" )) {
+                relPath = FilenameUtils.normalize( relPath );
+            }
             if (parent == null ) {
                 relPath = getRootPath(rootPOMRelPrefix);
             }