From a19afb186b2cef50862543618dd7fd12befafce6 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Tue, 22 Feb 2011 23:13:11 +0100 Subject: [PATCH] [FIXED JENKINS-7684] NullPointerException when an incremental build is triggered --- .../hudson/maven/MavenModuleSetBuild.java | 27 ++++++++++++------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java b/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java index d3fad1db7a..7ad0660de6 100755 --- a/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java +++ b/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java @@ -206,7 +206,7 @@ public class MavenModuleSetBuild extends AbstractMavenBuild subsidiaries, String path) { for (MavenModule sub : subsidiaries) - if (FilenameUtils.separatorsToUnix(path).startsWith(FilenameUtils.normalize(sub.getRelativePath()))) + if (FilenameUtils.separatorsToUnix(path).startsWith(normalizePath(sub.getRelativePath()))) return true; return false; } @@ -216,7 +216,7 @@ public class MavenModuleSetBuild extends AbstractMavenBuild abslPath, Set infos) throws IOException { String relPath = PathTool.getRelativeFilePath( this.moduleRootPath, mp.getBasedir().getPath() ); - - // JENKINS-8525 FilenameUtils.normalize for ../foo returns null - if (!StringUtils.startsWith( relPath, "../" )) { - relPath = FilenameUtils.normalize( relPath ); - } + relPath = normalizePath(relPath); + if (parent == null ) { relPath = getRootPath(rootPOMRelPrefix); }