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

dispose dynamically created class realms 

this is mostly to help integration tests reuse the same realm ids,
but plugging resource leaks is generally a good thing.

Signed-off-by: Igor Fedorenko <ifedorenko@apache.org>
This commit is contained in:
Igor Fedorenko 2015-02-05 19:44:45 -05:00
parent 8ed9a1caa8
commit 117df855e2
1 changed files with 36 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
View File

@ -27,10 +27,13 @@
import java.io.PrintStream;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Properties;
import java.util.Set;
import java.util.StringTokenizer;
import org.apache.commons.cli.CommandLine;
@ -81,6 +84,7 @@
import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.classworlds.ClassWorld;
import org.codehaus.plexus.classworlds.realm.ClassRealm;
import org.codehaus.plexus.classworlds.realm.NoSuchRealmException;
import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
import org.codehaus.plexus.logging.LoggerManager;
import org.codehaus.plexus.util.StringUtils;
@ -190,6 +194,20 @@ public int doMain( String[] args, String workingDirectory, PrintStream stdout, P
PrintStream oldout = System.out;
PrintStream olderr = System.err;
final Set<String> realms;
if ( classWorld != null )
{
realms = new HashSet<String>();
for ( ClassRealm realm : classWorld.getRealms() )
{
realms.add( realm.getId() );
}
}
else
{
realms = Collections.emptySet();
}
try
{
if ( stdout != null )
@ -208,6 +226,24 @@ public int doMain( String[] args, String workingDirectory, PrintStream stdout, P
}
finally
{
if ( classWorld != null )
{
for ( ClassRealm realm : new ArrayList<ClassRealm>( classWorld.getRealms() ) )
{
String realmId = realm.getId();
if ( !realms.contains( realmId ) )
{
try
{
classWorld.disposeRealm( realmId );
}
catch ( NoSuchRealmException ignored )
{
// can't happen
}
}
}
}
System.setOut( oldout );
System.setErr( olderr );
}