From: erik <erik@77661180-640e-0410-b3a8-9f9b13e6d0e0>
Date: Fri, 17 Mar 2006 22:50:39 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: wamblee-utils-0.2@603~543
X-Git-Url: http://wamblee.org/gitweb/?a=commitdiff_plain;h=5b7ef7fcfdbd2c4a0abc886056fb650f280cb93d;p=utils

---

diff --git a/trunk/crawler/basic/src/org/wamblee/crawler/AbstractPageRequest.java b/trunk/crawler/basic/src/org/wamblee/crawler/AbstractPageRequest.java
index 0c47430b..b37834bb 100644
--- a/trunk/crawler/basic/src/org/wamblee/crawler/AbstractPageRequest.java
+++ b/trunk/crawler/basic/src/org/wamblee/crawler/AbstractPageRequest.java
@@ -31,7 +31,6 @@ import javax.xml.transform.stream.StreamResult;
 
 import org.apache.commons.httpclient.Header;
 import org.apache.commons.httpclient.HttpClient;
-import org.apache.commons.httpclient.HttpException;
 import org.apache.commons.httpclient.HttpMethod;
 import org.apache.commons.httpclient.HttpStatus;
 import org.apache.commons.httpclient.NameValuePair;
@@ -111,11 +110,12 @@ public abstract class AbstractPageRequest implements PageRequest {
      * retries. 
      * @param aClient HTTP client to use. 
      * @param aMethod Method representing the request. 
-     * @return XML document describing the response. 
+     * @return XML document describing the response.
+     * @throws IOException In case of IO problems.  
      * @throws TransformerException In case transformation of the HTML to XML fails.
      */
     protected Document executeMethod(HttpClient aClient, HttpMethod aMethod)
-            throws TransformerException {
+            throws IOException, TransformerException {
         int triesLeft = _maxTries;
         while (triesLeft > 0) {
             triesLeft--;
@@ -136,10 +136,11 @@ public abstract class AbstractPageRequest implements PageRequest {
      * @param aClient HTTP client to use. 
      * @param aMethod Method to execute. 
      * @return XML document containing the result. 
+     * @throws IOException In case of IO problems. 
      * @throws TransformerException In case transformation of the result to XML fails.
      */
     protected Document executeMethodWithoutRetries(HttpClient aClient,
-            HttpMethod aMethod) throws TransformerException {
+            HttpMethod aMethod) throws IOException, TransformerException {
         try {
             aMethod = executeWithRedirects(aClient, aMethod);
             byte[] xhtmlData = getXhtml(aMethod);
@@ -155,10 +156,6 @@ public abstract class AbstractPageRequest implements PageRequest {
                     _os));
 
             return transformed;
-        } catch (HttpException e) {
-            throw new RuntimeException(e.getMessage(), e);
-        } catch (IOException e) {
-            throw new RuntimeException(e.getMessage(), e);
         } catch (TransformerConfigurationException e) {
             throw new RuntimeException(e.getMessage(), e);
         } finally {
diff --git a/trunk/crawler/basic/src/org/wamblee/crawler/GetPageRequest.java b/trunk/crawler/basic/src/org/wamblee/crawler/GetPageRequest.java
index 3da77b83..2ce267ee 100644
--- a/trunk/crawler/basic/src/org/wamblee/crawler/GetPageRequest.java
+++ b/trunk/crawler/basic/src/org/wamblee/crawler/GetPageRequest.java
@@ -16,6 +16,7 @@
 
 package org.wamblee.crawler;
 
+import java.io.IOException;
 import java.io.PrintStream;
 
 import javax.xml.transform.TransformerException;
@@ -75,6 +76,8 @@ public class GetPageRequest extends AbstractPageRequest {
             return executeMethod(aClient, method);
         } catch (TransformerException e) {
             throw new PageException(e.getMessage(), e);
+        } catch (IOException e) { 
+            throw new PageException(e.getMessage(), e);
         }
     }
 
diff --git a/trunk/crawler/basic/src/org/wamblee/crawler/PostPageRequest.java b/trunk/crawler/basic/src/org/wamblee/crawler/PostPageRequest.java
index 5fbc0e31..2bb7dc91 100644
--- a/trunk/crawler/basic/src/org/wamblee/crawler/PostPageRequest.java
+++ b/trunk/crawler/basic/src/org/wamblee/crawler/PostPageRequest.java
@@ -16,6 +16,7 @@
 
 package org.wamblee.crawler;
 
+import java.io.IOException;
 import java.io.PrintStream;
 
 import javax.xml.transform.TransformerException;
@@ -68,6 +69,8 @@ public class PostPageRequest extends AbstractPageRequest {
             return executeMethod(aClient, method);
         } catch (TransformerException e) {
             throw new PageException(e.getMessage(), e);
+        } catch (IOException e) { 
+            throw new PageException(e.getMessage(), e);
         }
     }