Update getFilenameFromHeader to return null on exception (including f…

…ileUrl.openConnection)
geonetwork · Nov 8, 2024 · 77d5621 · 77d5621
1 parent 702b3ae
commit 77d5621
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/core/src/main/java/org/fao/geonet/api/records/attachments/AbstractStore.java b/core/src/main/java/org/fao/geonet/api/records/attachments/AbstractStore.java
@@ -158,8 +158,9 @@ protected int canDownload(ServiceContext context, String metadataUuid, MetadataR
     }
 
     protected String getFilenameFromHeader(final URL fileUrl) throws IOException {
-        HttpURLConnection connection = (HttpURLConnection) fileUrl.openConnection();
+        HttpURLConnection connection = null;
         try {
+            connection = (HttpURLConnection) fileUrl.openConnection();
             connection.setRequestMethod("HEAD");
             connection.connect();
             String contentDisposition = connection.getHeaderField("Content-Disposition");
@@ -173,7 +174,9 @@ protected String getFilenameFromHeader(final URL fileUrl) throws IOException {
             log.error("Error retrieving resource filename from header", e);
             return null;
         } finally {
-            connection.disconnect();
+            if (connection != null) {
+                connection.disconnect();
+            }
         }
     }