[SCM-824] Upgrade of 'plexus-utils' to 3.0.23. o Updated to stop suppressing exceptions incorrectly.
Project: http://git-wip-us.apache.org/repos/asf/maven-scm/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-scm/commit/9f30e46c Tree: http://git-wip-us.apache.org/repos/asf/maven-scm/tree/9f30e46c Diff: http://git-wip-us.apache.org/repos/asf/maven-scm/diff/9f30e46c Branch: refs/heads/master Commit: 9f30e46c6e72edf7ef72683289ab5b5722d2f8e7 Parents: ace9597 Author: Christian Schulte <schu...@apache.org> Authored: Fri May 6 04:02:59 2016 +0200 Committer: Christian Schulte <schu...@apache.org> Committed: Fri May 6 04:02:59 2016 +0200 ---------------------------------------------------------------------- .../local/metadata/LocalScmMetadataUtils.java | 10 ++++-- .../checkout/LocalCheckOutCommandTckTest.java | 16 +++++----- .../update/LocalUpdateCommandTckTest.java | 17 +++++----- .../perforce/command/PerforceInfoCommand.java | 13 ++++---- .../perforce/command/PerforceWhereCommand.java | 33 +++++++++++--------- .../checkout/PerforceCheckOutCommand.java | 27 ++++++++-------- .../command/tag/PerforceTagCommand.java | 33 ++++++++++---------- .../commands/status/VssStatusConsumerTest.java | 22 +++++++------ .../java/org/apache/maven/scm/ScmTestCase.java | 6 +++- .../command/branch/BranchCommandTckTest.java | 5 ++- .../command/checkin/CheckInCommandTckTest.java | 29 ++++++++--------- .../scm/tck/command/tag/TagCommandTckTest.java | 4 ++- 12 files changed, 121 insertions(+), 94 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-scm/blob/9f30e46c/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/metadata/LocalScmMetadataUtils.java ---------------------------------------------------------------------- diff --git a/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/metadata/LocalScmMetadataUtils.java b/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/metadata/LocalScmMetadataUtils.java index 9446b9d..e66fe0b 100644 --- a/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/metadata/LocalScmMetadataUtils.java +++ b/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/metadata/LocalScmMetadataUtils.java @@ -83,10 +83,13 @@ public class LocalScmMetadataUtils { File metadataFile = new File( destinationDir, FILENAME ); metadataFile.createNewFile(); - Writer writer = WriterFactory.newXmlWriter( metadataFile ); + Writer writer = null; try { + writer = WriterFactory.newXmlWriter( metadataFile ); new LocalScmMetadataXpp3Writer().write( writer, metadata ); + writer.close(); + writer = null; } finally { @@ -113,6 +116,9 @@ public class LocalScmMetadataUtils { reader = ReaderFactory.newXmlReader( metadataFile ); result = new LocalScmMetadataXpp3Reader().read( reader ); + reader.close(); + reader = null; + return result; } catch ( XmlPullParserException e ) { @@ -128,12 +134,12 @@ public class LocalScmMetadataUtils { logger.warn( "Could not Read .maven-scm-local - ignoring", e ); } + return null; } finally { IOUtil.close( reader ); } - return result; } } http://git-wip-us.apache.org/repos/asf/maven-scm/blob/9f30e46c/maven-scm-providers/maven-scm-provider-local/src/test/java/org/apache/maven/scm/provider/local/command/checkout/LocalCheckOutCommandTckTest.java ---------------------------------------------------------------------- diff --git a/maven-scm-providers/maven-scm-provider-local/src/test/java/org/apache/maven/scm/provider/local/command/checkout/LocalCheckOutCommandTckTest.java b/maven-scm-providers/maven-scm-provider-local/src/test/java/org/apache/maven/scm/provider/local/command/checkout/LocalCheckOutCommandTckTest.java index 0515533..ab91b01 100644 --- a/maven-scm-providers/maven-scm-provider-local/src/test/java/org/apache/maven/scm/provider/local/command/checkout/LocalCheckOutCommandTckTest.java +++ b/maven-scm-providers/maven-scm-provider-local/src/test/java/org/apache/maven/scm/provider/local/command/checkout/LocalCheckOutCommandTckTest.java @@ -84,19 +84,21 @@ public class LocalCheckOutCommandTckTest // ---------------------------------------------------------------------- File metadataFile = new File( getWorkingCopy(), ".maven-scm-local" ); assertTrue( "Expected metadata file .maven-scm-local does not exist", metadataFile.exists() ); - Reader reader = new FileReader( metadataFile ); - LocalScmMetadata metadata; + Reader reader = null; try { - metadata = new LocalScmMetadataXpp3Reader().read( reader ); + reader = new FileReader( metadataFile ); + final LocalScmMetadata metadata = new LocalScmMetadataXpp3Reader().read( reader ); + reader.close(); + reader = null; + final File root = new File( getRepositoryRoot() + "/" + module ); + @SuppressWarnings( "unchecked" ) + final List<String> fileNames = FileUtils.getFileNames( root, "**", null, false ); + assertEquals( fileNames, metadata.getRepositoryFileNames() ); } finally { IOUtil.close( reader ); } - File root = new File( getRepositoryRoot() + "/" + module ); - @SuppressWarnings( "unchecked" ) - List<String> fileNames = FileUtils.getFileNames( root, "**", null, false ); - assertEquals( fileNames, metadata.getRepositoryFileNames() ); } } http://git-wip-us.apache.org/repos/asf/maven-scm/blob/9f30e46c/maven-scm-providers/maven-scm-provider-local/src/test/java/org/apache/maven/scm/provider/local/command/update/LocalUpdateCommandTckTest.java ---------------------------------------------------------------------- diff --git a/maven-scm-providers/maven-scm-provider-local/src/test/java/org/apache/maven/scm/provider/local/command/update/LocalUpdateCommandTckTest.java b/maven-scm-providers/maven-scm-provider-local/src/test/java/org/apache/maven/scm/provider/local/command/update/LocalUpdateCommandTckTest.java index 722809c..2518d55 100644 --- a/maven-scm-providers/maven-scm-provider-local/src/test/java/org/apache/maven/scm/provider/local/command/update/LocalUpdateCommandTckTest.java +++ b/maven-scm-providers/maven-scm-provider-local/src/test/java/org/apache/maven/scm/provider/local/command/update/LocalUpdateCommandTckTest.java @@ -133,21 +133,22 @@ public class LocalUpdateCommandTckTest // ---------------------------------------------------------------------- File metadataFile = new File( getUpdatingCopy(), ".maven-scm-local" ); assertTrue( "Expected metadata file .maven-scm-local does not exist", metadataFile.exists() ); - Reader reader = new FileReader( metadataFile ); - LocalScmMetadata metadata; + Reader reader = null; try { - metadata = new LocalScmMetadataXpp3Reader().read( reader ); + reader = new FileReader( metadataFile ); + final LocalScmMetadata metadata = new LocalScmMetadataXpp3Reader().read( reader ); + reader.close(); + reader = null; + final File root = new File( getRepositoryRoot() + "/" + moduleName ); + @SuppressWarnings( "unchecked" ) + List<String> fileNames = FileUtils.getFileNames( root, "**", null, false ); + assertEquals( fileNames, metadata.getRepositoryFileNames() ); } finally { IOUtil.close( reader ); } - File root = new File( getRepositoryRoot() + "/" + moduleName ); - @SuppressWarnings( "unchecked" ) - List<String> fileNames = FileUtils.getFileNames( root, "**", null, false ); - assertEquals( fileNames, metadata.getRepositoryFileNames() ); - } http://git-wip-us.apache.org/repos/asf/maven-scm/blob/9f30e46c/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/PerforceInfoCommand.java ---------------------------------------------------------------------- diff --git a/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/PerforceInfoCommand.java b/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/PerforceInfoCommand.java index 3e3089b..3794dfc 100644 --- a/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/PerforceInfoCommand.java +++ b/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/PerforceInfoCommand.java @@ -116,7 +116,7 @@ public class PerforceInfoCommand { return null; } - InputStreamReader isReader = null; + BufferedReader reader = null; try { Commandline command = PerforceScmProvider.createP4Command( (PerforceScmProviderRepository) repo, null ); @@ -126,11 +126,9 @@ public class PerforceInfoCommand getLogger().debug( PerforceScmProvider.clean( "Executing: " + command.toString() ) ); } Process proc = command.execute(); - isReader = new InputStreamReader( proc.getInputStream() ); - BufferedReader br = new BufferedReader( isReader ); - String line; + reader = new BufferedReader( new InputStreamReader( proc.getInputStream() ) ); entries = new HashMap<String, String>(); - while ( ( line = br.readLine() ) != null ) + for ( String line = reader.readLine(); line != null; line = reader.readLine() ) { int idx = line.indexOf( ':' ); if ( idx == -1 ) @@ -153,6 +151,9 @@ public class PerforceInfoCommand entries.put( key, value ); } } + + reader.close(); + reader = null; } catch ( CommandLineException e ) { @@ -164,7 +165,7 @@ public class PerforceInfoCommand } finally { - IOUtil.close( isReader ); + IOUtil.close( reader ); } return null; } http://git-wip-us.apache.org/repos/asf/maven-scm/blob/9f30e46c/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/PerforceWhereCommand.java ---------------------------------------------------------------------- diff --git a/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/PerforceWhereCommand.java b/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/PerforceWhereCommand.java index f7612bc..75a131e 100644 --- a/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/PerforceWhereCommand.java +++ b/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/PerforceWhereCommand.java @@ -74,8 +74,8 @@ public class PerforceWhereCommand return null; } - InputStreamReader isReader = null; - InputStreamReader isReaderErr = null; + BufferedReader outReader = null; + BufferedReader errReader = null; try { Commandline command = PerforceScmProvider.createP4Command( repo, null ); @@ -86,15 +86,12 @@ public class PerforceWhereCommand logger.debug( PerforceScmProvider.clean( "Executing: " + command.toString() ) ); } Process proc = command.execute(); - isReader = new InputStreamReader( proc.getInputStream() ); - isReaderErr = new InputStreamReader( proc.getErrorStream() ); - BufferedReader br = new BufferedReader( isReader ); - BufferedReader brErr = new BufferedReader( isReaderErr ); - String line; + outReader = new BufferedReader( new InputStreamReader( proc.getInputStream() ) ); + errReader = new BufferedReader( new InputStreamReader( proc.getErrorStream() ) ); String path = null; - while ( ( line = br.readLine() ) != null ) + for ( String line = outReader.readLine(); line != null; line = outReader.readLine() ) { - if ( line.indexOf( "not in client view" ) != -1 ) + if ( line.contains( "not in client view" ) ) { // uh oh, something bad is happening if ( logger.isErrorEnabled() ) @@ -103,7 +100,7 @@ public class PerforceWhereCommand } return null; } - if ( line.indexOf( "is not under" ) != -1 ) + if ( line.contains( "is not under" ) ) { // uh oh, something bad is happening if ( logger.isErrorEnabled() ) @@ -121,9 +118,9 @@ public class PerforceWhereCommand path = line.substring( 0, line.lastIndexOf( "//" ) - 1 ); } // Check for errors - while ( ( line = brErr.readLine() ) != null ) + for ( String line = errReader.readLine(); line != null; line = errReader.readLine() ) { - if ( line.indexOf( "not in client view" ) != -1 ) + if ( line.contains( "not in client view" ) ) { // uh oh, something bad is happening if ( logger.isErrorEnabled() ) @@ -132,7 +129,7 @@ public class PerforceWhereCommand } return null; } - if ( line.indexOf( "is not under" ) != -1 ) + if ( line.contains( "is not under" ) ) { // uh oh, something bad is happening if ( logger.isErrorEnabled() ) @@ -148,6 +145,12 @@ public class PerforceWhereCommand } } + outReader.close(); + outReader = null; + + errReader.close(); + errReader = null; + return path; } catch ( CommandLineException e ) @@ -168,8 +171,8 @@ public class PerforceWhereCommand } finally { - IOUtil.close( isReader ); - IOUtil.close( isReaderErr ); + IOUtil.close( outReader ); + IOUtil.close( errReader ); } } } http://git-wip-us.apache.org/repos/asf/maven-scm/blob/9f30e46c/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/checkout/PerforceCheckOutCommand.java ---------------------------------------------------------------------- diff --git a/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/checkout/PerforceCheckOutCommand.java b/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/checkout/PerforceCheckOutCommand.java index a64a487..47e113d 100644 --- a/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/checkout/PerforceCheckOutCommand.java +++ b/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/checkout/PerforceCheckOutCommand.java @@ -202,8 +202,8 @@ public class PerforceCheckOutCommand if ( clientspecExists && !prepo.isPersistCheckout() ) { // Delete the clientspec - InputStreamReader isReader = null; - InputStreamReader isReaderErr = null; + BufferedReader outReader = null; + BufferedReader errReader = null; try { cl = PerforceScmProvider.createP4Command( prepo, workingDirectory ); @@ -215,10 +215,9 @@ public class PerforceCheckOutCommand getLogger().info( "Executing: " + PerforceScmProvider.clean( cl.toString() ) ); } Process proc = cl.execute(); - isReader = new InputStreamReader( proc.getInputStream() ); - BufferedReader br = new BufferedReader( isReader ); - String line; - while ( ( line = br.readLine() ) != null ) + outReader = new BufferedReader( new InputStreamReader( proc.getInputStream() ) ); + errReader = new BufferedReader( new InputStreamReader( proc.getErrorStream() ) ); + for ( String line = outReader.readLine(); line != null; line = outReader.readLine() ) { if ( getLogger().isDebugEnabled() ) { @@ -226,11 +225,8 @@ public class PerforceCheckOutCommand } consumer.consumeLine( line ); } - br.close(); // Read errors from STDERR - isReaderErr = new InputStreamReader( proc.getErrorStream() ); - BufferedReader brErr = new BufferedReader( isReaderErr ); - while ( ( line = brErr.readLine() ) != null ) + for ( String line = errReader.readLine(); line != null; line = errReader.readLine() ) { if ( getLogger().isDebugEnabled() ) { @@ -238,7 +234,12 @@ public class PerforceCheckOutCommand } consumer.consumeLine( line ); } - brErr.close(); + + outReader.close(); + outReader = null; + + errReader.close(); + errReader = null; } catch ( CommandLineException e ) { @@ -256,8 +257,8 @@ public class PerforceCheckOutCommand } finally { - IOUtil.close( isReader ); - IOUtil.close( isReaderErr ); + IOUtil.close( outReader ); + IOUtil.close( errReader ); } } else if ( clientspecExists ) http://git-wip-us.apache.org/repos/asf/maven-scm/blob/9f30e46c/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/tag/PerforceTagCommand.java ---------------------------------------------------------------------- diff --git a/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/tag/PerforceTagCommand.java b/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/tag/PerforceTagCommand.java index 8126f84..4b5651e 100644 --- a/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/tag/PerforceTagCommand.java +++ b/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/tag/PerforceTagCommand.java @@ -40,7 +40,6 @@ import java.io.DataOutputStream; import java.io.File; import java.io.IOException; import java.io.InputStreamReader; -import java.io.OutputStream; import java.util.List; /** @@ -140,8 +139,8 @@ public class PerforceTagCommand { Commandline cl = createLabelCommandLine( (PerforceScmProviderRepository) repo, files.getBasedir() ); DataOutputStream dos = null; - InputStreamReader isReader = null; - InputStreamReader isReaderErr = null; + BufferedReader outReader = null; + BufferedReader errReader = null; try { if ( getLogger().isDebugEnabled() ) @@ -149,8 +148,7 @@ public class PerforceTagCommand getLogger().debug( PerforceScmProvider.clean( "Executing: " + cl.toString() ) ); } Process proc = cl.execute(); - OutputStream out = proc.getOutputStream(); - dos = new DataOutputStream( out ); + dos = new DataOutputStream( proc.getOutputStream() ); String label = createLabelSpecification( (PerforceScmProviderRepository) repo, tag, lock ); if ( getLogger().isDebugEnabled() ) { @@ -158,14 +156,11 @@ public class PerforceTagCommand } dos.write( label.getBytes() ); dos.close(); - out.close(); + dos = null; // TODO find & use a less naive InputStream multiplexer - isReader = new InputStreamReader( proc.getInputStream() ); - isReaderErr = new InputStreamReader( proc.getErrorStream() ); - BufferedReader stdout = new BufferedReader( isReader ); - BufferedReader stderr = new BufferedReader( isReaderErr ); - String line; - while ( ( line = stdout.readLine() ) != null ) + outReader = new BufferedReader( new InputStreamReader( proc.getInputStream() ) ); + errReader = new BufferedReader( new InputStreamReader( proc.getErrorStream() ) ); + for ( String line = outReader.readLine(); line != null; line = outReader.readLine() ) { if ( getLogger().isDebugEnabled() ) { @@ -173,7 +168,7 @@ public class PerforceTagCommand } consumer.consumeLine( line ); } - while ( ( line = stderr.readLine() ) != null ) + for ( String line = errReader.readLine(); line != null; line = errReader.readLine() ) { if ( getLogger().isDebugEnabled() ) { @@ -181,8 +176,12 @@ public class PerforceTagCommand } consumer.consumeLine( line ); } - stderr.close(); - stdout.close(); + + outReader.close(); + outReader = null; + + errReader.close(); + errReader = null; } catch ( CommandLineException e ) { @@ -201,8 +200,8 @@ public class PerforceTagCommand finally { IOUtil.close( dos ); - IOUtil.close( isReader ); - IOUtil.close( isReaderErr ); + IOUtil.close( outReader ); + IOUtil.close( errReader ); } } http://git-wip-us.apache.org/repos/asf/maven-scm/blob/9f30e46c/maven-scm-providers/maven-scm-provider-vss/src/test/java/org/apache/maven/scm/provider/vss/commands/status/VssStatusConsumerTest.java ---------------------------------------------------------------------- diff --git a/maven-scm-providers/maven-scm-provider-vss/src/test/java/org/apache/maven/scm/provider/vss/commands/status/VssStatusConsumerTest.java b/maven-scm-providers/maven-scm-provider-vss/src/test/java/org/apache/maven/scm/provider/vss/commands/status/VssStatusConsumerTest.java index dbedbaf..af7e58c 100644 --- a/maven-scm-providers/maven-scm-provider-vss/src/test/java/org/apache/maven/scm/provider/vss/commands/status/VssStatusConsumerTest.java +++ b/maven-scm-providers/maven-scm-provider-vss/src/test/java/org/apache/maven/scm/provider/vss/commands/status/VssStatusConsumerTest.java @@ -56,23 +56,27 @@ public class VssStatusConsumerTest public void testConsumeLine() throws ScmRepositoryException, NoSuchScmProviderException, IOException { - BufferedReader reader = new BufferedReader( new InputStreamReader( this.getResourceAsStream( "/test.txt" ), - "UTF-8" ) ); + BufferedReader reader = null; try { - ScmRepository repository = scmManager - .makeScmRepository( "scm:vss|username|password@C:/Program File/Visual Source Safe|D:/myProject" ); + reader = new BufferedReader( new InputStreamReader( this.getResourceAsStream( "/test.txt" ), "UTF-8" ) ); + ScmRepository repository = scmManager.makeScmRepository( + "scm:vss|username|password@C:/Program File/Visual Source Safe|D:/myProject" ); + ScmFileSet fileSet = new ScmFileSet( getTestFile( "target" ) ); - VssStatusConsumer consumer = new VssStatusConsumer( (VssScmProviderRepository) repository - .getProviderRepository(), new PlexusLogger( logger ), fileSet ); + VssStatusConsumer consumer = + new VssStatusConsumer( (VssScmProviderRepository) repository.getProviderRepository(), + new PlexusLogger( logger ), fileSet ); - String line = reader.readLine(); - while ( line != null ) + + for ( String line = reader.readLine(); line != null; line = reader.readLine() ) { consumer.consumeLine( line ); - line = reader.readLine(); } + + reader.close(); + reader = null; } finally { http://git-wip-us.apache.org/repos/asf/maven-scm/blob/9f30e46c/maven-scm-test/src/main/java/org/apache/maven/scm/ScmTestCase.java ---------------------------------------------------------------------- diff --git a/maven-scm-test/src/main/java/org/apache/maven/scm/ScmTestCase.java b/maven-scm-test/src/main/java/org/apache/maven/scm/ScmTestCase.java index bb87c31..3190f9b 100644 --- a/maven-scm-test/src/main/java/org/apache/maven/scm/ScmTestCase.java +++ b/maven-scm-test/src/main/java/org/apache/maven/scm/ScmTestCase.java @@ -33,6 +33,7 @@ import org.sonatype.plexus.components.sec.dispatcher.SecDispatcher; import java.io.File; import java.io.FileWriter; import java.io.IOException; +import java.io.Writer; import java.util.Calendar; import java.util.Date; import java.util.TimeZone; @@ -313,10 +314,13 @@ public abstract class ScmTestCase assertTrue( parent.mkdirs() ); } - FileWriter writer = new FileWriter( file ); + Writer writer = null; try { + writer = new FileWriter( file ); writer.write( contents ); + writer.close(); + writer = null; } finally { http://git-wip-us.apache.org/repos/asf/maven-scm/blob/9f30e46c/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/branch/BranchCommandTckTest.java ---------------------------------------------------------------------- diff --git a/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/branch/BranchCommandTckTest.java b/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/branch/BranchCommandTckTest.java index 62e657b..01bd934 100644 --- a/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/branch/BranchCommandTckTest.java +++ b/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/branch/BranchCommandTckTest.java @@ -98,10 +98,13 @@ public abstract class BranchCommandTckTest private void changeReadmeTxt( File readmeTxt ) throws Exception { - FileWriter output = new FileWriter( readmeTxt ); + FileWriter output = null; try { + output = new FileWriter( readmeTxt ); output.write( "changed file" ); + output.close(); + output = null; } finally { http://git-wip-us.apache.org/repos/asf/maven-scm/blob/9f30e46c/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/checkin/CheckInCommandTckTest.java ---------------------------------------------------------------------- diff --git a/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/checkin/CheckInCommandTckTest.java b/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/checkin/CheckInCommandTckTest.java index da7fd4b..6e2f703 100644 --- a/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/checkin/CheckInCommandTckTest.java +++ b/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/checkin/CheckInCommandTckTest.java @@ -183,25 +183,26 @@ public abstract class CheckInCommandTckTest private void createFooJava( File fooJava ) throws Exception { - FileWriter output = new FileWriter( fooJava ); - - PrintWriter printer = new PrintWriter( output ); + PrintWriter writer = null; try { - printer.println( "public class Foo" ); - printer.println( "{" ); + writer = new PrintWriter( new FileWriter( fooJava ) ); + writer.println( "public class Foo" ); + writer.println( "{" ); + + writer.println( " public void foo()" ); + writer.println( " {" ); + writer.println( " int i = 10;" ); + writer.println( " }" ); - printer.println( " public void foo()" ); - printer.println( " {" ); - printer.println( " int i = 10;" ); - printer.println( " }" ); + writer.println( "}" ); - printer.println( "}" ); + writer.close(); + writer = null; } finally { - IOUtil.close( output ); - IOUtil.close( printer ); + IOUtil.close( writer ); } } @@ -231,12 +232,12 @@ public abstract class CheckInCommandTckTest throws Exception { FileWriter output = null; - try { output = new FileWriter( readmeTxt ); - output.write( "changed file" ); + output.close(); + output = null; } finally { http://git-wip-us.apache.org/repos/asf/maven-scm/blob/9f30e46c/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/tag/TagCommandTckTest.java ---------------------------------------------------------------------- diff --git a/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/tag/TagCommandTckTest.java b/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/tag/TagCommandTckTest.java index 3692cf0..f9f099f 100644 --- a/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/tag/TagCommandTckTest.java +++ b/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/tag/TagCommandTckTest.java @@ -98,10 +98,12 @@ public abstract class TagCommandTckTest private void changeReadmeTxt( File readmeTxt ) throws Exception { - FileWriter output = new FileWriter( readmeTxt ); + FileWriter output = null; try { + output = new FileWriter( readmeTxt ); output.write( "changed file" ); + output.close(); } finally {
