Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

code formatting

This commit is contained in:
Hervé Boutemy 2012-12-02 12:38:12 +01:00
parent ab86435af1
commit 71a8427df6
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
maven-core/src/main/java/org/apache/maven/lifecycle/internal/BuilderCommon.java
View File

@ -133,8 +133,10 @@ public MavenExecutionPlan resolveBuildPlan( MavenSession session, MavenProject p
return executionPlan;
}
public void handleBuildError(final ReactorContext buildContext, final MavenSession rootSession, final MavenSession currentSession,
final MavenProject mavenProject, Exception e, final long buildStartTime) {
public void handleBuildError( final ReactorContext buildContext, final MavenSession rootSession,
final MavenSession currentSession, final MavenProject mavenProject, Exception e,
final long buildStartTime )
{
if ( e instanceof RuntimeException )
{
e = new InternalErrorException( "Internal error: " + e, e );
@ -185,5 +187,4 @@ public static String getKey( MavenProject project )
return project.getGroupId() + ':' + project.getArtifactId() + ':' + project.getVersion();
}
}

4
maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleModuleBuilder.java
View File

@ -92,7 +92,7 @@ public void buildProject( MavenSession session, MavenSession rootSession, Reacto
}
catch ( Exception e )
{
builderCommon.handleBuildError(reactorContext, rootSession, session, currentProject, e, buildStartTime);
builderCommon.handleBuildError( reactorContext, rootSession, session, currentProject, e, buildStartTime );
}
finally
{
@ -101,4 +101,4 @@ public void buildProject( MavenSession session, MavenSession rootSession, Reacto
Thread.currentThread().setContextClassLoader( reactorContext.getOriginalContextClassLoader() );
}
}
}
}

11
maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleWeaveBuilder.java
View File

@ -375,13 +375,14 @@ private Artifact findTestScopedArtifact( MavenProject upstreamProject )
return null;
}
private static boolean isThreadLockedAndEmpty(Artifact artifact){
return artifact instanceof ThreadLockedArtifact && !((ThreadLockedArtifact) artifact).hasReal();
private static boolean isThreadLockedAndEmpty( Artifact artifact )
{
return artifact instanceof ThreadLockedArtifact && !( (ThreadLockedArtifact) artifact ).hasReal();
}
private static Artifact findDependency( MavenProject project, Artifact upStreamArtifact )
{
if ( upStreamArtifact == null || isThreadLockedAndEmpty(upStreamArtifact))
if ( upStreamArtifact == null || isThreadLockedAndEmpty( upStreamArtifact ) )
{
return null;
}
@ -483,8 +484,6 @@ public void resolveFromUpstream()
artifactInThis.setFile( upstream.getFile() );
artifactInThis.setRepository( upstream.getRepository() );
artifactInThis.setResolved( true ); // Or maybe upstream.isResolved()....
}
}
}
}