[Archive-access-cvs] SF.net SVN: archive-access:[3343] trunk/archive-access/projects/wayback/ wayback-core/src/main/java/org/archive/wayback/liveweb/URLtoARCCacher.java

[<bra...@us...>]

Revision: 3343
          http://archive-access.svn.sourceforge.net/archive-access/?rev=3343&view=rev
Author:   bradtofel
Date:     2010-11-19 02:51:57 +0000 (Fri, 19 Nov 2010)

Log Message:
-----------
TWEAK: closing GetMethod's inputstream after using, moved, GetMethod.releaseConnections() to finally{} block. All attempts to make sure we don't leave filehandles open

Modified Paths:
--------------
    trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/liveweb/URLtoARCCacher.java

Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/liveweb/URLtoARCCacher.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/liveweb/URLtoARCCacher.java	2010-11-19 02:47:32 UTC (rev 3342)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/liveweb/URLtoARCCacher.java	2010-11-19 02:51:57 UTC (rev 3343)
@@ -132,8 +132,9 @@
 			getMethod.setRequestHeader("User-Agent", userAgent);
 			int code = client.executeMethod(getMethod);
 			LOGGER.info("URL(" + url + ") HTTP:" + code);
-			ByteOp.discardStream(getMethod.getResponseBodyAsStream());
-			getMethod.releaseConnection();
+			InputStream responseIS = getMethod.getResponseBodyAsStream(); 
+			ByteOp.discardStream(responseIS);
+			responseIS.close();
 			gotUrl = true;
 
 		} catch (URIException e) {
@@ -156,6 +157,9 @@
 		} finally {
 			recorder.closeRecorders();
 			Recorder.setHttpRecorder(null);
+			if(getMethod != null) {
+				getMethod.releaseConnection();
+			}
 		}
 
 		// now write the content, or a fake record:


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.