Fix keep-alive handling.

Mike Noordermeer · Mike Noordermeer · commit d979d7dafa90 · 2015-03-02T09:44:47.000+01:00
We now try to keep the connection alive by simply consuming the full response. If that does
not work, we revert to the old behaviour (to make sure we always close the underlying resources).
diff --git a/src/main/java/microsoft/exchange/webservices/data/HangingServiceRequestBase.java b/src/main/java/microsoft/exchange/webservices/data/HangingServiceRequestBase.java
@@ -260,7 +260,7 @@ private void parseResponses(Object state) {
               EwsServiceMultiResponseXmlReader.create(tracingStream, getService());
           responseObject = this.readResponse(ewsXmlReader);
           this.responseHandler.handleResponseObject(responseObject);
-				/*	}catch(Exception ex){
+                                /*	}catch(Exception ex){
 						this.disconnect(HangingRequestDisconnectReason.Exception, ex);
 						return;
 						
@@ -343,8 +343,11 @@ private void setIsConnected(boolean value) {
    */
   protected void disconnect() {
     synchronized (this) {
-      //this.request.close();
-      this.response.close();
+      try {
+        this.response.close();
+      } catch (IOException e) {
+        // Ignore exception on disconnection
+      }
       this.disconnect(HangingRequestDisconnectReason.UserInitiated, null);
     }
   }
@@ -358,7 +361,11 @@ protected void disconnect() {
   protected void disconnect(HangingRequestDisconnectReason reason,
       Exception exception) {
     if (this.isConnected()) {
-      this.response.close();
+      try {
+        this.response.close();
+      } catch (IOException e) {
+        // Ignore exception on disconnection
+      }
       this.internalOnDisconnect(reason, exception);
     }
   }
diff --git a/src/main/java/microsoft/exchange/webservices/data/HttpClientWebRequest.java b/src/main/java/microsoft/exchange/webservices/data/HttpClientWebRequest.java
@@ -18,10 +18,12 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of
 import org.apache.http.client.CredentialsProvider;
 import org.apache.http.client.config.AuthSchemes;
 import org.apache.http.client.config.RequestConfig;
+import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.client.protocol.HttpClientContext;
 import org.apache.http.config.SocketConfig;
 import org.apache.http.impl.client.*;
+import org.apache.http.util.EntityUtils;
 
 import java.io.*;
 import java.util.Arrays;
@@ -39,7 +41,7 @@ class HttpClientWebRequest extends HttpWebRequest {
    * The Http Method.
    */
   private HttpPost httpPost = null;
-  private HttpResponse response = null;
+  private CloseableHttpResponse response = null;
 
   private final CloseableHttpClient httpClient;
   private final HttpClientContext httpContext;
@@ -57,11 +59,20 @@ public HttpClientWebRequest(CloseableHttpClient httpClient, HttpClientContext ht
    * Releases the connection by Closing.
    */
   @Override
-  public void close() {
-    if (null != httpPost) {
+  public void close() throws IOException {
+    // First check if we can close the response, by consuming the complete response
+    // This releases the connection but keeps it alive for future requests
+    // If that is not possible, we simply cleanup the whole connection
+    if (response != null && response.getEntity() != null) {
+      EntityUtils.consume(response.getEntity());
+    } else if (httpPost != null) {
       httpPost.releaseConnection();
-      //postMethod.abort();
     }
+
+    // We set httpPost to null to prevent the connection from being closed again by an accidental
+    // second call to close()
+    // The response is kept, in case something in the library still wants to read something from it,
+    // like response code or headers
     httpPost = null;
   }
 
diff --git a/src/main/java/microsoft/exchange/webservices/data/HttpWebRequest.java b/src/main/java/microsoft/exchange/webservices/data/HttpWebRequest.java
@@ -475,7 +475,7 @@ public void setCredentials(String domain, String user, String pwd) {
   /**
    * Close.
    */
-  public abstract void close();
+  public abstract void close() throws IOException;
 
   /**
    * Prepare connection.
