Author: olamy
Date: Mon Jun 18 20:01:24 2012
New Revision: 1351470

URL: http://svn.apache.org/viewvc?rev=1351470&view=rev
Log:
[WAGON-375] wagon-http-lightweight must try to use persistent connection from 
the jdk.

Modified:
    
maven/wagon/trunk/wagon-providers/wagon-http-lightweight/src/main/java/org/apache/maven/wagon/providers/http/LightweightHttpWagon.java

Modified: 
maven/wagon/trunk/wagon-providers/wagon-http-lightweight/src/main/java/org/apache/maven/wagon/providers/http/LightweightHttpWagon.java
URL: 
http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-http-lightweight/src/main/java/org/apache/maven/wagon/providers/http/LightweightHttpWagon.java?rev=1351470&r1=1351469&r2=1351470&view=diff
==============================================================================
--- 
maven/wagon/trunk/wagon-providers/wagon-http-lightweight/src/main/java/org/apache/maven/wagon/providers/http/LightweightHttpWagon.java
 (original)
+++ 
maven/wagon/trunk/wagon-providers/wagon-http-lightweight/src/main/java/org/apache/maven/wagon/providers/http/LightweightHttpWagon.java
 Mon Jun 18 20:01:24 2012
@@ -19,6 +19,7 @@ package org.apache.maven.wagon.providers
  * under the License.
  */
 
+import org.apache.commons.io.IOUtils;
 import org.apache.maven.wagon.ConnectionException;
 import org.apache.maven.wagon.InputData;
 import org.apache.maven.wagon.OutputData;
@@ -338,10 +339,11 @@ public class LightweightHttpWagon
     public void closeConnection()
         throws ConnectionException
     {
-        if ( putConnection != null )
+        // use persistent connection feature provided by the jdk
+        /*if ( putConnection != null )
         {
             putConnection.disconnect();
-        }
+        }*/
         authenticator.resetWagon();
     }
 
@@ -365,13 +367,21 @@ public class LightweightHttpWagon
 
         InputStream is = inputData.getInputStream();
 
-        if ( is == null )
+        try
         {
-            throw new TransferFailedException(
-                url + " - Could not open input stream for resource: '" + 
resource + "'" );
-        }
 
-        return HtmlFileListParser.parseFileList( url, is );
+            if ( is == null )
+            {
+                throw new TransferFailedException(
+                    url + " - Could not open input stream for resource: '" + 
resource + "'" );
+            }
+
+            return HtmlFileListParser.parseFileList( url, is );
+        }
+        finally
+        {
+            IOUtils.closeQuietly( is );
+        }
     }
 
     public boolean resourceExists( String resourceName )


Reply via email to