storage-client cleanup or reuse of existing client not properly working. quick'n'dirty fix for now use new client for every call and make sure cleanup is executed

Author: andrew01ait

backmeup-storage-client/src/main/java/org/backmeup/storage/client/BackmeupStorageClient.java

@@ -211,7 +211,19 @@ public void addFileAccessRights(String accessToken, String ownerId, String fileP
         }
 
         HttpPost httpPost = new HttpPost(full);
-        CloseableHttpResponse response = this.client.execute(httpPost);
+        CloseableHttpClient myClient = createClient();
+        CloseableHttpResponse response = myClient.execute(httpPost);
+        try {
+            //
+        } catch (Exception e) {
+
+        } finally {
+            try {
+                response.close();
+                myClient.close();
+            } catch (IOException e) {
+            }
+        }
 
         int status = response.getStatusLine().getStatusCode();
         if (HttpStatus.SC_OK != status) {
@@ -236,13 +248,25 @@ public void removeFileAccessRights(String accessToken, String ownerId, String fi
         }
 
         HttpDelete httpDelete = new HttpDelete(full);
-        CloseableHttpResponse response = this.client.execute(httpDelete);
+        CloseableHttpClient myClient = createClient();
+        CloseableHttpResponse response = myClient.execute(httpDelete);
 
         int status = response.getStatusLine().getStatusCode();
         if (HttpStatus.SC_OK != status) {
             LOGGER.error("Request failed with status code: " + status);
             throw new IOException("Request failed with status code: " + status);
         }
+        try {
+            //
+        } catch (Exception e) {
+
+        } finally {
+            try {
+                response.close();
+                myClient.close();
+            } catch (IOException e) {
+            }
+        }
     }
 
     @Override
@@ -260,27 +284,33 @@ public boolean hasFileAccessRights(String accessToken, String ownerId, String fi
         }
 
         HttpGet httpGet = new HttpGet(full);
-        //httpGet.addHeader("Authorization", accessToken);
-        CloseableHttpResponse response = this.client.execute(httpGet);
+
+        CloseableHttpClient myClient = createClient();
+        CloseableHttpResponse response = myClient.execute(httpGet);
 
         int status = response.getStatusLine().getStatusCode();
         if (HttpStatus.SC_OK != status) {
             LOGGER.error("Request failed with status code: " + status);
             throw new IOException("Request failed with status code: " + status);
         }
-
         try {
             HttpEntity respEntity = response.getEntity();
             ObjectMapper mapper = createJsonMapper();
             Boolean hasAccess = mapper.readValue(respEntity.getContent(), Boolean.class);
             // release all resources held by httpentity
             EntityUtils.consume(respEntity);
+            response.close();
+            myClient.close();
             return hasAccess;
         } catch (Exception e) {
             LOGGER.error("", e);
             throw new IOException(e);
         } finally {
-            response.close();
+            try {
+                response.close();
+                myClient.close();
+            } catch (IOException e) {
+            }
         }
     }