You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by st...@apache.org on 2011/06/09 11:53:31 UTC
svn commit: r1133758 - in /maven/wagon/trunk:
wagon-provider-api/src/main/java/org/apache/maven/wagon/events/
wagon-provider-test/src/main/java/org/apache/maven/wagon/
wagon-provider-test/src/main/java/org/apache/maven/wagon/http/
Author: struberg
Date: Thu Jun 9 09:53:31 2011
New Revision: 1133758
URL: http://svn.apache.org/viewvc?rev=1133758&view=rev
Log:
make sure streams get closed and aggregate equivalent case statements
Modified:
maven/wagon/trunk/wagon-provider-api/src/main/java/org/apache/maven/wagon/events/SessionEvent.java
maven/wagon/trunk/wagon-provider-api/src/main/java/org/apache/maven/wagon/events/TransferEvent.java
maven/wagon/trunk/wagon-provider-test/src/main/java/org/apache/maven/wagon/FileTestUtils.java
maven/wagon/trunk/wagon-provider-test/src/main/java/org/apache/maven/wagon/http/HttpWagonTestCase.java
Modified: maven/wagon/trunk/wagon-provider-api/src/main/java/org/apache/maven/wagon/events/SessionEvent.java
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-provider-api/src/main/java/org/apache/maven/wagon/events/SessionEvent.java?rev=1133758&r1=1133757&r2=1133758&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-provider-api/src/main/java/org/apache/maven/wagon/events/SessionEvent.java (original)
+++ maven/wagon/trunk/wagon-provider-api/src/main/java/org/apache/maven/wagon/events/SessionEvent.java Thu Jun 9 09:53:31 2011
@@ -145,23 +145,14 @@ public class SessionEvent
{
switch ( eventType )
{
-
case SessionEvent.SESSION_CLOSED:
- break;
case SessionEvent.SESSION_DISCONNECTED:
- break;
case SessionEvent.SESSION_DISCONNECTING:
- break;
case SessionEvent.SESSION_ERROR_OCCURRED:
- break;
case SessionEvent.SESSION_LOGGED_IN:
- break;
case SessionEvent.SESSION_LOGGED_OFF:
- break;
case SessionEvent.SESSION_OPENED:
- break;
case SessionEvent.SESSION_OPENING:
- break;
case SessionEvent.SESSION_CONNECTION_REFUSED:
break;
default :
Modified: maven/wagon/trunk/wagon-provider-api/src/main/java/org/apache/maven/wagon/events/TransferEvent.java
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-provider-api/src/main/java/org/apache/maven/wagon/events/TransferEvent.java?rev=1133758&r1=1133757&r2=1133758&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-provider-api/src/main/java/org/apache/maven/wagon/events/TransferEvent.java (original)
+++ maven/wagon/trunk/wagon-provider-api/src/main/java/org/apache/maven/wagon/events/TransferEvent.java Thu Jun 9 09:53:31 2011
@@ -140,7 +140,6 @@ public class TransferEvent
{
case REQUEST_PUT:
- break;
case REQUEST_GET:
break;
@@ -168,13 +167,9 @@ public class TransferEvent
{
case TRANSFER_INITIATED:
- break;
case TRANSFER_STARTED:
- break;
case TRANSFER_COMPLETED:
- break;
case TRANSFER_PROGRESS:
- break;
case TRANSFER_ERROR:
break;
default :
Modified: maven/wagon/trunk/wagon-provider-test/src/main/java/org/apache/maven/wagon/FileTestUtils.java
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-provider-test/src/main/java/org/apache/maven/wagon/FileTestUtils.java?rev=1133758&r1=1133757&r2=1133758&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-provider-test/src/main/java/org/apache/maven/wagon/FileTestUtils.java (original)
+++ maven/wagon/trunk/wagon-provider-test/src/main/java/org/apache/maven/wagon/FileTestUtils.java Thu Jun 9 09:53:31 2011
@@ -19,13 +19,13 @@ package org.apache.maven.wagon;
* under the License.
*/
+import org.codehaus.plexus.util.FileUtils;
+
import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
import java.io.Writer;
-import org.codehaus.plexus.util.FileUtils;
-
/**
* @author <a href="michal@apache.org>Michal Maczka</a>
* @version $Id$
@@ -107,9 +107,14 @@ public class FileTestUtils
Writer writer = new FileWriter( f );
- writer.write( content );
-
- writer.close();
+ try
+ {
+ writer.write( content );
+ }
+ finally
+ {
+ writer.close();
+ }
return f;
}
Modified: maven/wagon/trunk/wagon-provider-test/src/main/java/org/apache/maven/wagon/http/HttpWagonTestCase.java
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-provider-test/src/main/java/org/apache/maven/wagon/http/HttpWagonTestCase.java?rev=1133758&r1=1133757&r2=1133758&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-provider-test/src/main/java/org/apache/maven/wagon/http/HttpWagonTestCase.java (original)
+++ maven/wagon/trunk/wagon-provider-test/src/main/java/org/apache/maven/wagon/http/HttpWagonTestCase.java Thu Jun 9 09:53:31 2011
@@ -628,18 +628,32 @@ public abstract class HttpWagonTestCase
file.getParentFile().mkdirs();
file.deleteOnExit();
OutputStream out = new FileOutputStream( file );
- out.write( child.getBytes() );
- out.close();
+ try
+ {
+ out.write( child.getBytes() );
+ }
+ finally
+ {
+ out.close();
+ }
file = new File( parent, child + ".gz" );
file.deleteOnExit();
+ String content;
out = new FileOutputStream( file );
out = new GZIPOutputStream( out );
+ try
+ {
// write out different data than non-gz file, so we can
// assert the gz version was returned
- String content = file.getAbsolutePath();
+ content = file.getAbsolutePath();
out.write( content.getBytes() );
- out.close();
+ }
+ finally
+ {
+ out.close();
+ }
+
return content;
}