archive-access-cvs Mailing List for Web Archive Access Utilities (Page 17)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 3405
          http://archive-access.svn.sourceforge.net/archive-access/?rev=3405&view=rev
Author:   bradtofel
Date:     2011-02-06 14:49:24 +0000 (Sun, 06 Feb 2011)

Log Message:
-----------
FEATURE: Exposed connect and socket timeouts, which are now caught, capturing IllegalArugmentException on GetMethod..

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

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

--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/liveweb/RemoteLiveWebCache.java	2011-02-06 14:48:05 UTC (rev 3404)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/liveweb/RemoteLiveWebCache.java	2011-02-06 14:49:24 UTC (rev 3405)
@@ -22,9 +22,12 @@
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.net.ConnectException;
+import java.net.SocketTimeoutException;
 import java.net.URL;
+import java.util.logging.Logger;
 import java.util.zip.GZIPInputStream;
 
+import org.apache.commons.httpclient.ConnectTimeoutException;
 import org.apache.commons.httpclient.HostConfiguration;
 import org.apache.commons.httpclient.HttpClient;
 import org.apache.commons.httpclient.HttpMethod;
@@ -43,10 +46,13 @@
  *
  */
 public class RemoteLiveWebCache implements LiveWebCache {
+	private static final Logger LOGGER = Logger.getLogger(
+			RemoteLiveWebCache.class.getName());
 
     private MultiThreadedHttpConnectionManager connectionManager = null;
     private HostConfiguration hostConfiguration = null;
     private HttpClient http = null; 
+
     /**
      * 
      */
@@ -57,14 +63,21 @@
     	http.setHostConfiguration(hostConfiguration);
     }
 
-	/* (non-Javadoc)
+    /* (non-Javadoc)
 	 * @see org.archive.wayback.liveweb.LiveWebCache#getCachedResource(java.net.URL, long, boolean)
 	 */
 	public Resource getCachedResource(URL url, long maxCacheMS,
 			boolean bUseOlder) throws LiveDocumentNotAvailableException,
 			LiveWebCacheUnavailableException, IOException {
 		String urlString = url.toExternalForm();
-	    HttpMethod method = new GetMethod(urlString);
+		HttpMethod method = null;
+		try {
+			method = new GetMethod(urlString);
+		} catch(IllegalArgumentException e) {
+			LOGGER.warning("Bad URL for live web fetch:" + urlString);
+			throw new LiveDocumentNotAvailableException("Url:" + urlString +
+					"does not look like an URL?");
+		}
 	    try {
 	    	int status = http.executeMethod(method);
 	    	if(status == 200) {
@@ -84,9 +97,16 @@
 	    	}
 	    } catch (ResourceNotAvailableException e) {
     		throw new LiveDocumentNotAvailableException(urlString);
+
 	    } catch (ConnectException e) {
     		throw new LiveWebCacheUnavailableException(e.getLocalizedMessage() 
     				+ " : " + urlString);
+	    } catch (SocketTimeoutException e) {
+    		throw new LiveWebCacheUnavailableException(e.getLocalizedMessage() 
+    				+ " : " + urlString);
+	    } catch(ConnectTimeoutException e) {
+    		throw new LiveWebCacheUnavailableException(e.getLocalizedMessage() 
+    				+ " : " + urlString);	    	
 		} finally {
 	    	method.releaseConnection();
 	    }
@@ -127,4 +147,31 @@
     	connectionManager.getParams().
     		setMaxConnectionsPerHost(hostConfiguration, maxHostConnections);
     }
+	/**
+	 * @return the connectionTimeoutMS
+	 */
+	public int getConnectionTimeoutMS() {
+		return connectionManager.getParams().getConnectionTimeout();
+	}
+
+	/**
+	 * @param connectionTimeoutMS the connectionTimeoutMS to set
+	 */
+	public void setConnectionTimeoutMS(int connectionTimeoutMS) {
+    	connectionManager.getParams().setConnectionTimeout(connectionTimeoutMS);
+	}
+
+	/**
+	 * @return the socketTimeoutMS
+	 */
+	public int getSocketTimeoutMS() {
+		return connectionManager.getParams().getSoTimeout();
+	}
+
+	/**
+	 * @param socketTimeoutMS the socketTimeoutMS to set
+	 */
+	public void setSocketTimeoutMS(int socketTimeoutMS) {
+    	connectionManager.getParams().setSoTimeout(socketTimeoutMS);
+	}
 }


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




2005	Jan	Feb	Mar	Apr	May	Jun	Jul (1)	Aug (10)	Sep (36)	Oct (339)	Nov (103)	Dec (152)
2006	Jan (141)	Feb (102)	Mar (125)	Apr (203)	May (57)	Jun (30)	Jul (139)	Aug (46)	Sep (64)	Oct (105)	Nov (34)	Dec (162)
2007	Jan (81)	Feb (57)	Mar (141)	Apr (72)	May (9)	Jun (1)	Jul (144)	Aug (88)	Sep (40)	Oct (43)	Nov (34)	Dec (20)
2008	Jan (44)	Feb (45)	Mar (16)	Apr (36)	May (8)	Jun (77)	Jul (177)	Aug (66)	Sep (8)	Oct (33)	Nov (13)	Dec (37)
2009	Jan (2)	Feb (5)	Mar (8)	Apr	May (36)	Jun (19)	Jul (46)	Aug (8)	Sep (1)	Oct (66)	Nov (61)	Dec (10)
2010	Jan (13)	Feb (16)	Mar (38)	Apr (76)	May (47)	Jun (32)	Jul (35)	Aug (45)	Sep (20)	Oct (61)	Nov (24)	Dec (16)
2011	Jan (22)	Feb (34)	Mar (11)	Apr (8)	May (24)	Jun (23)	Jul (11)	Aug (42)	Sep (81)	Oct (48)	Nov (21)	Dec (20)
2012	Jan (30)	Feb (25)	Mar (4)	Apr (6)	May (1)	Jun (5)	Jul (5)	Aug (8)	Sep (6)	Oct (6)	Nov	Dec

archive-access-cvs Mailing List for Web Archive Access Utilities (Page 17)

archive-access-cvs — CVS commits