From d5e56bb5995aa2a6fd6cb096d792efd64aacc044 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Mon, 20 Dec 2010 22:21:37 +0100 Subject: [PATCH] remove duplicate variable --- .../java/hudson/maven/MavenModuleSetBuild.java | 15 ++++++--------- 1 file changed, 6 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 4e030bd024..1aa87e3059 100644 --- a/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java +++ b/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java @@ -477,7 +477,7 @@ public class MavenModuleSetBuild extends AbstractMavenBuild)MavenModuleSetBuild.this)); @@ -502,7 +502,7 @@ public class MavenModuleSetBuild extends AbstractMavenBuild(); List changedModules = new ArrayList(); @@ -661,12 +661,12 @@ public class MavenModuleSetBuild extends AbstractMavenBuild poms; try { - poms = getModuleRoot().act(new PomParser(listener, mvn, project, workspacePath)); + poms = getModuleRoot().act(new PomParser(listener, mvn, project)); } catch (IOException e) { if (e.getCause() instanceof AbortException) throw (AbortException) e.getCause(); @@ -966,8 +966,7 @@ public class MavenModuleSetBuild extends AbstractMavenBuild abslPath, Set infos) throws IOException { String absolutePath = FilenameUtils.normalize( mp.getBasedir().getAbsolutePath()); - String relPath = StringUtils.removeStart( absolutePath, this.workspacePath ); + String relPath = StringUtils.removeStart( absolutePath, this.workspaceProper ); relPath = StringUtils.remove( relPath, '/' );