From 5bde95056919dba5a05244089318b10453339a7c Mon Sep 17 00:00:00 2001 From: bchristi Date: Fri, 17 Jan 2025 14:21:30 -0800 Subject: [PATCH 1/3] Remove finalizer from RMI RegistryContext --- .../classes/com/sun/jndi/rmi/registry/RegistryContext.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/jdk.naming.rmi/share/classes/com/sun/jndi/rmi/registry/RegistryContext.java b/src/jdk.naming.rmi/share/classes/com/sun/jndi/rmi/registry/RegistryContext.java index e5090cbaae10b..6a78546f9b8d3 100644 --- a/src/jdk.naming.rmi/share/classes/com/sun/jndi/rmi/registry/RegistryContext.java +++ b/src/jdk.naming.rmi/share/classes/com/sun/jndi/rmi/registry/RegistryContext.java @@ -100,11 +100,6 @@ public RegistryContext(String host, int port, Hashtable env) reference = ctx.reference; } - @SuppressWarnings("removal") - protected void finalize() { - close(); - } - public Object lookup(Name name) throws NamingException { if (name.isEmpty()) { return (new RegistryContext(this)); From e4b1d4a16cb5736c2361094d239423abeca2a923 Mon Sep 17 00:00:00 2001 From: bchristi Date: Fri, 17 Jan 2025 14:33:03 -0800 Subject: [PATCH 2/3] Remove finalizer from RMI RegistryContext.BindingEnumeration --- .../com/sun/jndi/rmi/registry/RegistryContext.java | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/jdk.naming.rmi/share/classes/com/sun/jndi/rmi/registry/RegistryContext.java b/src/jdk.naming.rmi/share/classes/com/sun/jndi/rmi/registry/RegistryContext.java index 6a78546f9b8d3..2f77c383bd697 100644 --- a/src/jdk.naming.rmi/share/classes/com/sun/jndi/rmi/registry/RegistryContext.java +++ b/src/jdk.naming.rmi/share/classes/com/sun/jndi/rmi/registry/RegistryContext.java @@ -552,11 +552,6 @@ class BindingEnumeration implements NamingEnumeration { nextName = 0; } - @SuppressWarnings("removal") - protected void finalize() { - ctx.close(); - } - public boolean hasMore() { if (nextName >= names.length) { ctx.close(); @@ -593,8 +588,7 @@ public Binding nextElement() { } } - @SuppressWarnings("deprecation") public void close () { - finalize(); + ctx.close(); } } From 387aa517d62a4a819588fa61fcd93e6e27446544 Mon Sep 17 00:00:00 2001 From: bchristi Date: Fri, 17 Jan 2025 14:35:10 -0800 Subject: [PATCH 3/3] Remove finalizer from RMI LogInputStream --- .../share/classes/sun/rmi/log/LogInputStream.java | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/java.rmi/share/classes/sun/rmi/log/LogInputStream.java b/src/java.rmi/share/classes/sun/rmi/log/LogInputStream.java index d4176b63305ae..7853d47c0d7f4 100644 --- a/src/java.rmi/share/classes/sun/rmi/log/LogInputStream.java +++ b/src/java.rmi/share/classes/sun/rmi/log/LogInputStream.java @@ -124,12 +124,4 @@ public int available() throws IOException { public void close() { length = 0; } - - /** - * Closes the stream when garbage is collected. - */ - @SuppressWarnings("removal") - protected void finalize() throws IOException { - close(); - } }