Author: krosenvold
Date: Tue Oct 9 18:20:48 2012
New Revision: 1396155
URL: http://svn.apache.org/viewvc?rev=1396155&view=rev
Log:
o Partial application of cleanup not entirely successful
Modified:
maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/ForkedLauncher.java
Modified:
maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/ForkedLauncher.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/ForkedLauncher.java?rev=1396155&r1=1396154&r2=1396155&view=diff
==============================================================================
---
maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/ForkedLauncher.java
(original)
+++
maven/shared/trunk/maven-verifier/src/main/java/org/apache/maven/it/ForkedLauncher.java
Tue Oct 9 18:20:48 2012
@@ -24,9 +24,7 @@ import java.io.FileWriter;
import java.io.IOException;
import java.io.Writer;
import java.util.Collections;
-import java.util.Iterator;
import java.util.Map;
-
import org.apache.maven.shared.utils.cli.CommandLineException;
import org.apache.maven.shared.utils.cli.CommandLineUtils;
import org.apache.maven.shared.utils.cli.Commandline;
@@ -79,9 +77,9 @@ class ForkedLauncher
if ( envVars != null )
{
- for ( Iterator i = envVars.keySet().iterator(); i.hasNext(); )
+ for ( Object o : envVars.keySet() )
{
- String key = (String) i.next();
+ String key = (String) o;
cmd.addEnvironment( key, (String) envVars.get( key ) );
}
@@ -96,9 +94,9 @@ class ForkedLauncher
cmd.setWorkingDirectory( workingDirectory );
- for ( int i = 0; i < cliArgs.length; i++ )
+ for ( String cliArg : cliArgs )
{
- cmd.createArgument().setValue( cliArgs[i] );
+ cmd.createArg().setValue( cliArg );
}
Writer logWriter = new FileWriter( logFile );