You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2009/07/27 19:23:22 UTC
svn commit: r798226 -
/maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
Author: bentmann
Date: Mon Jul 27 17:23:21 2009
New Revision: 798226
URL: http://svn.apache.org/viewvc?rev=798226&view=rev
Log:
o Fixed TCCL handling
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java?rev=798226&r1=798225&r2=798226&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java Mon Jul 27 17:23:21 2009
@@ -309,23 +309,32 @@
reactorModelPool.put( model.getGroupId(), model.getArtifactId(), model.getVersion(), model.getPomFile() );
}
- for ( InterimResult interimResult : interimResults )
+ ClassLoader oldContextClassLoader = Thread.currentThread().getContextClassLoader();
+
+ try
{
- try
+ for ( InterimResult interimResult : interimResults )
{
- ModelBuildingResult result = modelBuilder.build( interimResult.request, interimResult.result );
+ try
+ {
+ ModelBuildingResult result = modelBuilder.build( interimResult.request, interimResult.result );
- MavenProject project = toProject( result, config, interimResult.listener );
+ MavenProject project = toProject( result, config, interimResult.listener );
- results.add( new DefaultProjectBuildingResult( project, result.getProblems() ) );
- }
- catch ( ModelBuildingException e )
- {
- results.add( new DefaultProjectBuildingResult( interimResult.pomFile, e.getProblems() ) );
+ results.add( new DefaultProjectBuildingResult( project, result.getProblems() ) );
+ }
+ catch ( ModelBuildingException e )
+ {
+ results.add( new DefaultProjectBuildingResult( interimResult.pomFile, e.getProblems() ) );
- errors = true;
+ errors = true;
+ }
}
}
+ finally
+ {
+ Thread.currentThread().setContextClassLoader( oldContextClassLoader );
+ }
if ( errors )
{