Removed unnecessary code duplication in the Maven builders

This commit is contained in:
Christoph Kutzinski committed 2011-12-22 22:05:19 +01:00
1 parent 41278a7a30
commit bc24201485
6 files changed
+71 -95

No files matched your search

@@ -699,7 +699,7 @@ public class MavenModuleSetBuild extends AbstractMavenBuild<MavenModuleSet,Maven
pom = parentLoc;
ProcessCache.MavenProcess process = null;
final ProcessCache.MavenProcess process;
boolean maven3orLater = mavenBuildInformation.isMaven3OrLater();
if ( maven3orLater )
@@ -778,38 +778,27 @@ public class MavenModuleSetBuild extends AbstractMavenBuild<MavenModuleSet,Maven
}
}
if (maven3orLater)
{
Maven3Builder maven3Builder =
final AbstractMavenBuilder builder;
if (maven3orLater) {
builder =
new Maven3Builder( slistener, proxies, project.sortedActiveModules, margs.toList(), envVars, mavenBuildInformation );
MavenProbeAction mpa=null;
try {
mpa = new MavenProbeAction(project,process.channel);
addAction(mpa);
r = process.call(maven3Builder);
return r;
} finally {
maven3Builder.end(launcher);
getActions().remove(mpa);
process.discard();
}
} else {
Maven2Builder builder =
builder =
new Maven2Builder(slistener, proxies, project.sortedActiveModules, margs.toList(), envVars, mavenBuildInformation);
MavenProbeAction mpa=null;
try {
mpa = new MavenProbeAction(project,process.channel);
addAction(mpa);
r = process.call(builder);
return r;
} finally {
builder.end(launcher);
getActions().remove(mpa);
process.discard();
}
}
MavenProbeAction mpa=null;
try {
mpa = new MavenProbeAction(project,process.channel);
addAction(mpa);
r = process.call(builder);
return r;
} finally {
builder.end(launcher);
getActions().remove(mpa);
process.discard();
}
} catch (InterruptedException e) {
r = Executor.currentExecutor().abortResult();
throw e;