8196587: Remove use of deprecated finalize method from JPEGImageLoader

Reviewed-by: kcr, jvos
openjdk · Dec 18, 2019 · 1140d34 · 1140d34
1 parent d2d44b4
commit 1140d34
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 19 deletions.
diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/iio/ImageStorage.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/iio/ImageStorage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -257,6 +257,8 @@ public static ImageFrame[] loadAll(InputStream input, ImageLoadListener listener
             double width, double height, boolean preserveAspectRatio,
             float pixelScale, boolean smooth) throws ImageStorageException {
         ImageLoader loader = null;
+        ImageFrame[] images = null;
+
         try {
             if (isIOS) {
                 // no extension/signature recognition done here,
@@ -265,17 +267,20 @@ public static ImageFrame[] loadAll(InputStream input, ImageLoadListener listener
             } else {
                 loader = getLoaderBySignature(input, listener);
             }
+            if (loader != null) {
+                images = loadAll(loader, width, height, preserveAspectRatio, pixelScale, smooth);
+            } else {
+                throw new ImageStorageException("No loader for image data");
+            }
+        } catch (ImageStorageException ise) {
+            throw ise;
         } catch (IOException e) {
             throw new ImageStorageException(e.getMessage(), e);
+        } finally {
+            if (loader != null) {
+                loader.dispose();
+            }
         }
-
-        ImageFrame[] images = null;
-        if (loader != null) {
-            images = loadAll(loader, width, height, preserveAspectRatio, pixelScale, smooth);
-        } else {
-            throw new ImageStorageException("No loader for image data");
-        }
-
         return images;
     }
 
@@ -326,6 +331,9 @@ public static ImageFrame[] loadAll(String input, ImageLoadListener listener,
                 throw new ImageStorageException("No loader for image data");
             }
         } finally {
+            if (loader != null) {
+                loader.dispose();
+            }
             try {
                 if (theStream != null) {
                     theStream.close();

diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/iio/ios/IosImageLoader.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/iio/ios/IosImageLoader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -212,10 +212,6 @@ public synchronized void dispose() {
         }
     }
 
-    protected void finalize() {
-        dispose();
-    }
-
    /**
     * @inheritDoc
     */

diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/iio/jpeg/JPEGImageLoader.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/iio/jpeg/JPEGImageLoader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -201,10 +201,6 @@ public synchronized void dispose() {
         }
     }
 
-    protected void finalize() {
-        dispose();
-    }
-
     public ImageFrame load(int imageIndex, int width, int height, boolean preserveAspectRatio, boolean smooth) throws IOException {
         if (imageIndex != 0) {
             return null;