Revert "bugfix reconnect (issue #25)"

This reverts commit a2e2c78.

Author: a-brandt

src/main/java/com/arangodb/http/HttpManager.java

@@ -33,7 +33,6 @@
 import org.apache.http.HttpResponse;
 import org.apache.http.HttpStatus;
 import org.apache.http.NameValuePair;
-import org.apache.http.NoHttpResponseException;
 import org.apache.http.StatusLine;
 import org.apache.http.auth.AuthenticationException;
 import org.apache.http.auth.Credentials;
@@ -353,29 +352,24 @@ public HttpResponseEntity execute(HttpRequestEntity requestEntity) throws Arango
 			try {
 				return executeInternal(configure.getBaseUrl(), requestEntity);
 			} catch (SocketException ex) {
-				handleException(++retries, connectRetryCount, ex);
-			} catch (NoHttpResponseException ex) {
-				handleException(++retries, connectRetryCount, ex);
-			}
-		}
-	}
-
-	private void handleException(int retries, int connectRetryCount, Exception ex) throws ArangoException {
-		if (connectRetryCount > 0 && retries > connectRetryCount) {
-			logger.error(ex.getMessage(), ex);
-			throw new ArangoException(ex);
-		}
+				retries++;
+				if (connectRetryCount > 0 && retries > connectRetryCount) {
+					logger.error(ex.getMessage(), ex);
+					throw new ArangoException(ex);
+				}
 
-		if (configure.hasFallbackHost()) {
-			configure.changeCurrentHost();
-		}
+				if (configure.hasFallbackHost()) {
+					configure.changeCurrentHost();
+				}
 
-		logger.warn(ex.getMessage(), ex);
-		try {
-			// 1000 milliseconds is one second.
-			Thread.sleep(configure.getConnectRetryWait());
-		} catch (InterruptedException iex) {
-			Thread.currentThread().interrupt();
+				logger.warn(ex.getMessage(), ex);
+				try {
+					// 1000 milliseconds is one second.
+					Thread.sleep(configure.getConnectRetryWait());
+				} catch (InterruptedException iex) {
+					Thread.currentThread().interrupt();
+				}
+			}
 		}
 	}
 
@@ -386,10 +380,9 @@ private void handleException(int retries, int connectRetryCount, Exception ex) t
 	 *            the request
 	 * @return the response of the request
 	 * @throws ArangoException
-	 * @throws NoHttpResponseException
 	 */
 	private HttpResponseEntity executeInternal(String baseUrl, HttpRequestEntity requestEntity)
-			throws ArangoException, SocketException, NoHttpResponseException {
+			throws ArangoException, SocketException {
 
 		String url = buildUrl(baseUrl, requestEntity);
 
@@ -437,16 +430,12 @@ private HttpResponseEntity executeInternal(String baseUrl, HttpRequestEntity req
 		return responseEntity;
 	}
 
-	private HttpResponse executeRequest(HttpRequestBase request)
-			throws SocketException, ArangoException, NoHttpResponseException {
+	private HttpResponse executeRequest(HttpRequestBase request) throws SocketException, ArangoException {
 		try {
 			return client.execute(request);
 		} catch (SocketException ex) {
 			// catch SocketException before IOException
 			throw ex;
-		} catch (NoHttpResponseException ex) {
-			// catch NoHttpResponseException before IOException
-			throw ex;
 		} catch (ClientProtocolException e) {
 			throw new ArangoException(e);
 		} catch (IOException e) {