You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2012/03/29 15:41:48 UTC
svn commit: r1306860 - in
/maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command:
PerforceInfoCommand.java PerforceWhereCommand.java
Author: olamy
Date: Thu Mar 29 13:41:48 2012
New Revision: 1306860
URL: http://svn.apache.org/viewvc?rev=1306860&view=rev
Log:
some other stream close in finally block
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/PerforceInfoCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/PerforceWhereCommand.java
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/PerforceInfoCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/PerforceInfoCommand.java?rev=1306860&r1=1306859&r2=1306860&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/PerforceInfoCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/PerforceInfoCommand.java Thu Mar 29 13:41:48 2012
@@ -28,6 +28,7 @@ import org.apache.maven.scm.log.ScmLogge
import org.apache.maven.scm.provider.ScmProviderRepository;
import org.apache.maven.scm.provider.perforce.PerforceScmProvider;
import org.apache.maven.scm.provider.perforce.repository.PerforceScmProviderRepository;
+import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.cli.CommandLineException;
import org.codehaus.plexus.util.cli.Commandline;
@@ -66,7 +67,7 @@ public class PerforceInfoCommand
{
private static PerforceInfoCommand singleton = null;
- private Map<String,String> entries = null;
+ private Map<String, String> entries = null;
public static PerforceInfoCommand getInfo( ScmLogger logger, PerforceScmProviderRepository repo )
{
@@ -78,8 +79,7 @@ public class PerforceInfoCommand
return (String) entries.get( key );
}
- private static synchronized PerforceInfoCommand getSingleton( ScmLogger logger,
- PerforceScmProviderRepository repo )
+ private static synchronized PerforceInfoCommand getSingleton( ScmLogger logger, PerforceScmProviderRepository repo )
{
if ( singleton == null )
{
@@ -105,7 +105,9 @@ public class PerforceInfoCommand
return singleton;
}
- /** {@inheritDoc} */
+ /**
+ * {@inheritDoc}
+ */
protected ScmResult executeCommand( ScmProviderRepository repo, ScmFileSet scmFileSet,
CommandParameters commandParameters )
throws ScmException
@@ -114,7 +116,7 @@ public class PerforceInfoCommand
{
return null;
}
-
+ InputStreamReader isReader = null;
try
{
Commandline command = PerforceScmProvider.createP4Command( (PerforceScmProviderRepository) repo, null );
@@ -124,9 +126,10 @@ public class PerforceInfoCommand
getLogger().debug( PerforceScmProvider.clean( "Executing: " + command.toString() ) );
}
Process proc = command.execute();
- BufferedReader br = new BufferedReader( new InputStreamReader( proc.getInputStream() ) );
+ isReader = new InputStreamReader( proc.getInputStream() );
+ BufferedReader br = new BufferedReader( isReader );
String line;
- entries = new HashMap<String,String>();
+ entries = new HashMap<String, String>();
while ( ( line = br.readLine() ) != null )
{
int idx = line.indexOf( ':' );
@@ -159,6 +162,10 @@ public class PerforceInfoCommand
{
throw new ScmException( e.getLocalizedMessage() );
}
+ finally
+ {
+ IOUtil.close( isReader );
+ }
return null;
}
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/PerforceWhereCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/PerforceWhereCommand.java?rev=1306860&r1=1306859&r2=1306860&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/PerforceWhereCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/PerforceWhereCommand.java Thu Mar 29 13:41:48 2012
@@ -22,6 +22,7 @@ package org.apache.maven.scm.provider.pe
import org.apache.maven.scm.log.ScmLogger;
import org.apache.maven.scm.provider.perforce.PerforceScmProvider;
import org.apache.maven.scm.provider.perforce.repository.PerforceScmProviderRepository;
+import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.cli.CommandLineException;
import org.codehaus.plexus.util.cli.Commandline;
@@ -73,6 +74,8 @@ public class PerforceWhereCommand
return null;
}
+ InputStreamReader isReader = null;
+ InputStreamReader isReaderErr = null;
try
{
Commandline command = PerforceScmProvider.createP4Command( repo, null );
@@ -83,8 +86,10 @@ public class PerforceWhereCommand
logger.debug( PerforceScmProvider.clean( "Executing: " + command.toString() ) );
}
Process proc = command.execute();
- BufferedReader br = new BufferedReader( new InputStreamReader( proc.getInputStream() ) );
- BufferedReader brErr = new BufferedReader( new InputStreamReader( proc.getErrorStream() ) );
+ isReader = new InputStreamReader( proc.getInputStream() );
+ isReaderErr = new InputStreamReader( proc.getErrorStream() );
+ BufferedReader br = new BufferedReader( isReader );
+ BufferedReader brErr = new BufferedReader( isReaderErr );
String line;
String path = null;
while ( ( line = br.readLine() ) != null )
@@ -161,5 +166,10 @@ public class PerforceWhereCommand
}
throw new RuntimeException( e.getLocalizedMessage() );
}
+ finally
+ {
+ IOUtil.close( isReader );
+ IOUtil.close( isReaderErr );
+ }
}
}