Merge pull request #123 from GoogleCloudPlatform/resource-leak

Close HTTP response
GoogleCloudPlatform · Dec 16, 2020 · 185477e · 185477e
2 parents 5a40fbd + 0f8909f
commit 185477e
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 6 deletions.
diff --git a/dicom_util/src/main/java/com/google/cloud/healthcare/DicomWebClient.java b/dicom_util/src/main/java/com/google/cloud/healthcare/DicomWebClient.java
@@ -121,15 +121,25 @@ public void stowRs(InputStream in) throws IDicomWebClient.DicomWebException {
     InputStreamContent dicomStream = new InputStreamContent("application/dicom", in);
     content.addPart(new MultipartContent.Part(dicomStream));
 
+    HttpResponse resp = null;
     try {
       HttpRequest httpRequest = requestFactory.buildPostRequest(url, content);
-      httpRequest.execute();
+      resp = httpRequest.execute();
     } catch (HttpResponseException e) {
       throw new DicomWebException(
           String.format("StowRs: %d, %s", e.getStatusCode(), e.getStatusMessage()),
           e, e.getStatusCode(), Status.ProcessingFailure);
     } catch (IOException e) {
       throw new IDicomWebClient.DicomWebException(e);
     }
+    finally {
+      try {
+        if ((resp) != null) {
+          resp.disconnect();
+        }
+      } catch(IOException e) {
+        throw new IDicomWebClient.DicomWebException(e);
+      }
+    }
   }
 }
diff --git a/import/src/main/java/com/google/cloud/healthcare/imaging/dicomadapter/CStoreService.java b/import/src/main/java/com/google/cloud/healthcare/imaging/dicomadapter/CStoreService.java
@@ -130,12 +130,14 @@ protected void store(
         });
       }
 
-      InputStream inWithHeader =
-          DicomStreamUtil.dicomStreamWithFileMetaHeader(
-              sopInstanceUID, sopClassUID, transferSyntax, countingStream);
+      try(InputStream inWithHeader = DicomStreamUtil.dicomStreamWithFileMetaHeader(
+              sopInstanceUID, sopClassUID, transferSyntax, countingStream)) {
+        processStream(association.getApplicationEntity().getDevice().getExecutor(),
+            inWithHeader, processorList);
+      } catch (IOException e) {
+        throw new DicomServiceException(Status.ProcessingFailure, e);
+      }
 
-      processStream(association.getApplicationEntity().getDevice().getExecutor(),
-          inWithHeader, processorList);
 
       response.setInt(Tag.Status, VR.US, Status.Success);
       MonitoringService.addEvent(Event.CSTORE_BYTES, countingStream.getCount());