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 class BuilderCommon
return executionPlan; return executionPlan;
} }
public void handleBuildError(final ReactorContext buildContext, final MavenSession rootSession, final MavenSession currentSession, public void handleBuildError( final ReactorContext buildContext, final MavenSession rootSession,
final MavenProject mavenProject, Exception e, final long buildStartTime) { final MavenSession currentSession, final MavenProject mavenProject, Exception e,
final long buildStartTime )
{
if ( e instanceof RuntimeException ) if ( e instanceof RuntimeException )
{ {
e = new InternalErrorException( "Internal error: " + e, e ); e = new InternalErrorException( "Internal error: " + e, e );
@ -185,5 +187,4 @@ public class BuilderCommon
return project.getGroupId() + ':' + project.getArtifactId() + ':' + project.getVersion(); 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 class LifecycleModuleBuilder
} }
catch ( Exception e ) catch ( Exception e )
{ {
builderCommon.handleBuildError(reactorContext, rootSession, session, currentProject, e, buildStartTime); builderCommon.handleBuildError( reactorContext, rootSession, session, currentProject, e, buildStartTime );
} }
finally finally
{ {
@ -101,4 +101,4 @@ public class LifecycleModuleBuilder
Thread.currentThread().setContextClassLoader( reactorContext.getOriginalContextClassLoader() ); Thread.currentThread().setContextClassLoader( reactorContext.getOriginalContextClassLoader() );
} }
} }
} }

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

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