Merge pull request #3268 from mapfish/mem-related-fixes

Memory related cleanups
mapfish · Apr 25, 2024 · f67ee91 · f67ee91
2 parents 3ff0f9b + 69e4c50
commit f67ee91
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 8 deletions.
diff --git a/core/src/main/java/org/mapfish/print/http/HttpRequestFetcher.java b/core/src/main/java/org/mapfish/print/http/HttpRequestFetcher.java
@@ -127,7 +127,9 @@ public void close() {
         try {
           this.body.close();
         } catch (IOException e) {
-          // ignored
+          LOGGER.warn("Failed to close body", e);
+        } finally {
+          this.body = null;
         }
       }
     }

diff --git a/core/src/main/java/org/mapfish/print/http/MfClientHttpRequestFactoryImpl.java b/core/src/main/java/org/mapfish/print/http/MfClientHttpRequestFactoryImpl.java
@@ -229,12 +229,6 @@ public String getStatusText() {
       return this.response.getStatusLine().getReasonPhrase();
     }
 
-    @Override
-    protected void finalize() throws Throwable {
-      super.finalize();
-      close();
-    }
-
     @Override
     public void close() {
       try {

diff --git a/core/src/main/java/org/mapfish/print/map/tiled/CoverageTask.java b/core/src/main/java/org/mapfish/print/map/tiled/CoverageTask.java
@@ -228,7 +228,7 @@ protected Tile compute() {
                 TilePreparationTask.class.getName()
                     + ".read."
                     + StatsUtils.quotePart(this.tileRequest.getURI().getHost());
-            LOGGER.debug("\n\t{} -- {}", this.tileRequest.getMethod(), this.tileRequest.getURI());
+            LOGGER.debug("{} -- {}", this.tileRequest.getMethod(), this.tileRequest.getURI());
             final Timer.Context timerDownload = this.registry.timer(baseMetricName).time();
             try (ClientHttpResponse response = this.tileRequest.execute()) {
               final HttpStatus statusCode = response.getStatusCode();