From f88b5242490d1bb66e81d7206f1f49b6030c07cf Mon Sep 17 00:00:00 2001 From: Jason van Zyl Date: Tue, 18 Nov 2008 17:17:26 +0000 Subject: [PATCH] o using thread local lookup setting the realm to null once it's done its work with the plugin git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@718656 13f79535-47bb-0310-9956-ffa450edef68 --- .../maven/plugin/DefaultPluginManager.java | 3 ++- .../listeners/BuildExtensionListener.java | 17 ++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java b/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java index bd67a1a4d8..2d174443cd 100644 --- a/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java +++ b/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java @@ -713,7 +713,8 @@ public class DefaultPluginManager if ( oldLookupRealm != null ) { - container.setLookupRealm( oldLookupRealm ); + //container.setLookupRealm( oldLookupRealm ); + container.setLookupRealm( null ); } Thread.currentThread().setContextClassLoader( oldClassLoader ); diff --git a/maven-project/src/main/java/org/apache/maven/project/builder/listeners/BuildExtensionListener.java b/maven-project/src/main/java/org/apache/maven/project/builder/listeners/BuildExtensionListener.java index 2bd204b88a..9dc9543248 100644 --- a/maven-project/src/main/java/org/apache/maven/project/builder/listeners/BuildExtensionListener.java +++ b/maven-project/src/main/java/org/apache/maven/project/builder/listeners/BuildExtensionListener.java @@ -1,17 +1,16 @@ package org.apache.maven.project.builder.listeners; -import org.apache.maven.shared.model.ModelEventListener; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.List; + +import org.apache.maven.project.builder.ArtifactModelContainerFactory; +import org.apache.maven.project.builder.ProjectUri; import org.apache.maven.shared.model.ModelContainer; import org.apache.maven.shared.model.ModelContainerFactory; +import org.apache.maven.shared.model.ModelEventListener; import org.apache.maven.shared.model.ModelProperty; -import org.apache.maven.project.builder.ProjectUri; -import org.apache.maven.project.builder.ArtifactModelContainerFactory; - -import java.util.Iterator; -import java.util.List; -import java.util.Collection; -import java.util.Arrays; -import java.util.ArrayList; public class BuildExtensionListener implements ModelEventListener