fix: clean up resources and bump request buffer size

dhis2 · Feb 14, 2025 · b4118e0 · b4118e0
1 parent 6990a99
commit b4118e0
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/route/RouteService.java b/dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/route/RouteService.java
@@ -212,7 +212,8 @@ public ResponseEntity<StreamingResponseBody> execute(
 
     Flux<DataBuffer> requestBodyFlux =
         DataBufferUtils.read(
-            new InputStreamResource(request.getInputStream()), dataBufferFactory, 4096);
+                new InputStreamResource(request.getInputStream()), dataBufferFactory, 8192)
+            .doOnNext(DataBufferUtils.releaseConsumer());
     WebClient.RequestHeadersSpec<?> requestHeadersSpec =
         webClient
             .method(httpMethod)
@@ -263,9 +264,12 @@ public ResponseEntity<StreamingResponseBody> execute(
     StreamingResponseBody streamingResponseBody =
         out -> {
           if (responseEntityFlux.getBody() != null) {
-            DataBufferUtils.write(responseEntityFlux.getBody(), out)
-                .doOnNext(DataBufferUtils.releaseConsumer())
-                .blockLast();
+            try (out) {
+              Flux<DataBuffer> dataBufferFlux =
+                  DataBufferUtils.write(responseEntityFlux.getBody(), out)
+                      .doOnNext(DataBufferUtils.releaseConsumer());
+              dataBufferFlux.blockLast();
+            }
           }
         };
     return new ResponseEntity<>(