OLINGO-999 | Ensuring that payloadManager is closing PipedInputStream…

… in case that http client leaked that. Signed-off-by: Bogdan Ilies <[email protected]>
apache · Nov 27, 2019 · cb50f9b · cb50f9b
1 parent 68cfa45
commit cb50f9b
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/...pache/olingo/client/core/communication/request/streamed/AbstractODataStreamedRequest.java b/...pache/olingo/client/core/communication/request/streamed/AbstractODataStreamedRequest.java
@@ -105,8 +105,11 @@ public T payloadManager() {
         public HttpResponse call() throws Exception { //NOSONAR
           ((HttpEntityEnclosingRequestBase) request).setEntity(
                   URIUtils.buildInputStreamEntity(odataClient, payloadManager.getBody()));
-
-          return doExecute();
+          try {
+            return doExecute();
+          } finally {
+            payloadManager.finalizeBody();
+          }
         }
       }));
     } else {
@@ -116,7 +119,11 @@ public HttpResponse call() throws Exception { //NOSONAR
       futureWrapper.setWrapped(odataClient.getConfiguration().getExecutor().submit(new Callable<HttpResponse>() {
         @Override
         public HttpResponse call() throws Exception { //NOSONAR
-          return doExecute();
+          try {
+            return doExecute();
+          } finally {
+            payloadManager.finalizeBody();
+          }
         }
       }));
     }