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

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

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.