Pull request to fix issue #9

src/java/com/fourspaces/couchdb/CouchResponse.java

@@ -57,6 +57,8 @@ public class CouchResponse {
 
 	private String error_id;
 	private String error_reason;
+
+   private static final String EXCEPTION_ID = "exception";
 
 	/**
 	 * C-tor parses the method results to build the CouchResponse object.
@@ -112,6 +114,23 @@ public class CouchResponse {
 		log.debug(toString());
 	}
 
+   /**
+    * C-tor that handles exceptions from the HTTP client
+    *
+    * @param req Original HTTP request to couchdb server
+    * @param exception Exception thrown during request to server
+    * @throws IOException
+    */
+   CouchResponse(HttpRequestBase req, Exception exception) {
+      headers = new Header[0];
+      body = "";
+      path = req.getURI().getPath();
+
+      this.error_id = EXCEPTION_ID;
+      this.error_reason = exception.getMessage();
+      ok=false;
+   }
+
 	@Override
 	/**
 	 * A better toString for this object... can be very verbose though.

src/java/com/fourspaces/couchdb/Session.java

@@ -477,6 +477,7 @@ protected CouchResponse http(HttpRequestBase req) {
 			entity = httpResponse.getEntity();
 			lastResponse = new CouchResponse(req, httpResponse);
 		} catch (IOException e) {
+         lastResponse = new CouchResponse(req, e);
 			log.error(ExceptionUtils.getStackTrace(e));
 		} finally {
 			  if (entity != null) {
@@ -503,6 +504,11 @@ public void setUserAgent(String ua)
 	{
 		httpParams.setParameter(AllClientPNames.USER_AGENT, ua);
 	}
+
+   public void setHttpClient(HttpClient httpClient)
+   {
+      this.httpClient = httpClient;
+   }
 
 	public void setConnectionTimeout(int milliseconds)
 	{

src/test/com/fourspaces/couchdb/SessionTest.java

@@ -0,0 +1,41 @@
+package com.fourspaces.couchdb;
+
+import com.fourspaces.couchdb.test.TestHttpClient;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.net.SocketTimeoutException;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+
+public class SessionTest
+{
+
+	@Before public void setup() {
+	}
+
+	@After public void tearDown() {
+	}
+
+
+	@Test
+   public void testTimeout() {
+      Session session = new Session("localhost", 5984);
+      String reason = "test timeout";
+      SocketTimeoutException exception = new SocketTimeoutException(reason);
+      TestHttpClient httpClient = new TestHttpClient(exception);
+      session.setHttpClient(httpClient);
+
+      //url doesn't matter since we'll mock a timeout exception
+      CouchResponse response = session.get("http://nowhere.example.com:5984/nosuchdb");
+
+      assertFalse(response.isOk());
+      assertEquals(response.getErrorId(), "exception");
+      assertEquals(response.getErrorReason(), reason);
+	}
+
+
+
+}

src/test/com/fourspaces/couchdb/test/TestHttpClient.java

@@ -0,0 +1,98 @@
+package com.fourspaces.couchdb.test;
+
+import org.apache.http.HttpHost;
+import org.apache.http.HttpRequest;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.ClientProtocolException;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.ResponseHandler;
+import org.apache.http.client.methods.HttpUriRequest;
+import org.apache.http.conn.ClientConnectionManager;
+import org.apache.http.params.HttpParams;
+import org.apache.http.protocol.HttpContext;
+
+import java.io.IOException;
+import java.net.SocketTimeoutException;
+
+/**
+ * Date: 11/10/12
+ *
+ * @author lreeder
+ */
+public class TestHttpClient implements HttpClient
+{
+
+   private IOException exceptionToThrow = null;
+
+   public TestHttpClient()
+   {
+   }
+
+   public TestHttpClient(IOException exceptionToThrow)
+   {
+      this.exceptionToThrow = exceptionToThrow;
+   }
+
+   public HttpParams getParams()
+   {
+      throw new UnsupportedOperationException("Method getParams not implemented.");
+   }
+
+   public ClientConnectionManager getConnectionManager()
+   {
+      throw new UnsupportedOperationException("Method getConnectionManager not implemented.");
+   }
+
+   public HttpResponse execute(HttpUriRequest httpUriRequestIn) throws IOException, ClientProtocolException
+   {
+
+      if(exceptionToThrow != null)
+      {
+         throw exceptionToThrow;
+      }
+
+      throw new UnsupportedOperationException("Method execute not implemented.");
+   }
+
+   public HttpResponse execute(HttpUriRequest httpUriRequestIn,
+      HttpContext httpContextIn) throws IOException, ClientProtocolException
+   {
+      throw new UnsupportedOperationException("Method execute not implemented.");
+   }
+
+   public HttpResponse execute(HttpHost httpHostIn,
+      HttpRequest httpRequestIn) throws IOException, ClientProtocolException
+   {
+      throw new UnsupportedOperationException("Method execute not implemented.");
+   }
+
+   public HttpResponse execute(HttpHost httpHostIn, HttpRequest httpRequestIn,
+      HttpContext httpContextIn) throws IOException, ClientProtocolException
+   {
+      throw new UnsupportedOperationException("Method execute not implemented.");
+   }
+
+   public <T> T execute(HttpUriRequest httpUriRequestIn,
+      ResponseHandler<? extends T> responseHandlerIn) throws IOException, ClientProtocolException
+   {
+      throw new UnsupportedOperationException("Method execute not implemented.");
+   }
+
+   public <T> T execute(HttpUriRequest httpUriRequestIn, ResponseHandler<? extends T> responseHandlerIn,
+      HttpContext httpContextIn) throws IOException, ClientProtocolException
+   {
+      throw new UnsupportedOperationException("Method execute not implemented.");
+   }
+
+   public <T> T execute(HttpHost httpHostIn, HttpRequest httpRequestIn,
+      ResponseHandler<? extends T> responseHandlerIn) throws IOException, ClientProtocolException
+   {
+      throw new UnsupportedOperationException("Method execute not implemented.");
+   }
+
+   public <T> T execute(HttpHost httpHostIn, HttpRequest httpRequestIn, ResponseHandler<? extends T> responseHandlerIn,
+      HttpContext httpContextIn) throws IOException, ClientProtocolException
+   {
+      throw new UnsupportedOperationException("Method execute not implemented.");
+   }
+}