From be09ca67a6237cd176dd9e8562ae86adb85a38f0 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Mon, 21 Feb 2011 22:07:58 +0100 Subject: [PATCH] [FIXED JENKINS-8525] NPE during in parsing POMs for Multi Module Build --- .../src/main/java/hudson/maven/MavenModuleSetBuild.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java b/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java index 561d1386ec..d3fad1db7a 100755 --- a/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java +++ b/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java @@ -1209,9 +1209,11 @@ public class MavenModuleSetBuild extends AbstractMavenBuild abslPath, Set 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); }