Merge pull request #5139 from vespa-engine/vekterli/remove-messagebus-finalizers

Remove finalizers from MessageBus components

8 files changed, 0 insertions, 90 deletions

diff --git a/messagebus/src/main/java/com/yahoo/messagebus/DestinationSession.java b/messagebus/src/main/java/com/yahoo/messagebus/DestinationSession.java
index c1a033a38d3..72322fdee8b 100644
--- a/messagebus/src/main/java/com/yahoo/messagebus/DestinationSession.java
+++ b/messagebus/src/main/java/com/yahoo/messagebus/DestinationSession.java
@@ -34,17 +34,6 @@ public final class DestinationSession implements MessageHandler {
         this.msgHandler = params.getMessageHandler();
     }
 
-    @Override
-    protected void finalize() throws Throwable {
-        try {
-            if (destroy()) {
-                log.log(LogLevel.WARNING, "DestinationSession destroyed by finalizer, please review application shutdown logic.");
-            }
-        } finally {
-            super.finalize();
-        }
-    }
-
     /**
      * Sets the destroyed flag to true. The very first time this method is called, it cleans up all its dependencies.
      * Even if you retain a reference to this object, all of its content is allowed to be garbage collected.
diff --git a/messagebus/src/main/java/com/yahoo/messagebus/IntermediateSession.java b/messagebus/src/main/java/com/yahoo/messagebus/IntermediateSession.java
index ed6e6f30f0c..03065d09dbd 100644
--- a/messagebus/src/main/java/com/yahoo/messagebus/IntermediateSession.java
+++ b/messagebus/src/main/java/com/yahoo/messagebus/IntermediateSession.java
@@ -36,17 +36,6 @@ public final class IntermediateSession implements MessageHandler, ReplyHandler {
         this.replyHandler= params.getReplyHandler();
     }
 
-    @Override
-    protected void finalize() throws Throwable {
-        try {
-            if (destroy()) {
-                log.log(LogLevel.WARNING, "IntermediateSession destroyed by finalizer, please review application shutdown logic.");
-            }
-        } finally {
-            super.finalize();
-        }
-    }
-
     /**
      * Sets the destroyed flag to true. The very first time this method is called, it cleans up all its dependencies.
      * Even if you retain a reference to this object, all of its content is allowed to be garbage collected.
diff --git a/messagebus/src/main/java/com/yahoo/messagebus/MessageBus.java b/messagebus/src/main/java/com/yahoo/messagebus/MessageBus.java
index 623a953dda5..e1540740621 100644
--- a/messagebus/src/main/java/com/yahoo/messagebus/MessageBus.java
+++ b/messagebus/src/main/java/com/yahoo/messagebus/MessageBus.java
@@ -163,17 +163,6 @@ public class MessageBus implements ConfigHandler, NetworkOwner, MessageHandler,
         return metrics;
     }
 
-    @Override
-    protected void finalize() throws Throwable {
-        try {
-            if (destroy()) {
-                log.log(LogLevel.WARNING, "MessageBus destroyed by finalizer, please review application shutdown logic.");
-            }
-        } finally {
-            super.finalize();
-        }
-    }
-
     /**
      * <p>Sets the destroyed flag to true. The very first time this method is
      * called, it cleans up all its dependencies. Even if you retain a reference
diff --git a/messagebus/src/main/java/com/yahoo/messagebus/Messenger.java b/messagebus/src/main/java/com/yahoo/messagebus/Messenger.java
index 28d523201b1..fdfff98d182 100755
--- a/messagebus/src/main/java/com/yahoo/messagebus/Messenger.java
+++ b/messagebus/src/main/java/com/yahoo/messagebus/Messenger.java
@@ -185,17 +185,6 @@ public class Messenger implements Runnable {
         }
     }
 
-    @Override
-    protected void finalize() throws Throwable {
-        try {
-            if (destroy()) {
-                log.log(LogLevel.WARNING, "Messenger destroyed by finalizer, please review application shutdown logic.");
-            }
-        } finally {
-            super.finalize();
-        }
-    }
-
     /**
      * <p>Defines the required interface for tasks to be posted to this
      * worker.</p>
diff --git a/messagebus/src/main/java/com/yahoo/messagebus/RPCMessageBus.java b/messagebus/src/main/java/com/yahoo/messagebus/RPCMessageBus.java
index c1c948cbdf4..1db532b52c9 100644
--- a/messagebus/src/main/java/com/yahoo/messagebus/RPCMessageBus.java
+++ b/messagebus/src/main/java/com/yahoo/messagebus/RPCMessageBus.java
@@ -69,18 +69,6 @@ public class RPCMessageBus extends NetworkMessageBus {
         this(Arrays.asList(protocol), new RPCNetworkParams().setIdentity(new Identity(configId)), null);
     }
 
-    // Overrides Object.
-    @Override
-    protected void finalize() throws Throwable {
-        try {
-            if (destroy()) {
-                log.log(LogLevel.WARNING, "RPCMessageBus destroyed by finalizer, please review application shutdown logic.");
-            }
-        } finally {
-            super.finalize();
-        }
-    }
-
     /**
      * Sets the destroyed flag to true. The very first time this method is called, it cleans up all its dependencies.
      * Even if you retain a reference to this object, all of its content is allowed to be garbage collected.
diff --git a/messagebus/src/main/java/com/yahoo/messagebus/SourceSession.java b/messagebus/src/main/java/com/yahoo/messagebus/SourceSession.java
index 18232756891..2c49e733ed3 100644
--- a/messagebus/src/main/java/com/yahoo/messagebus/SourceSession.java
+++ b/messagebus/src/main/java/com/yahoo/messagebus/SourceSession.java
@@ -54,17 +54,6 @@ public final class SourceSession implements ReplyHandler, MessageBus.SendBlocked
         mbus.register(this);
     }
 
-    @Override
-    protected void finalize() throws Throwable {
-        try {
-            if (destroy()) {
-                log.log(LogLevel.WARNING, "SourceSession destroyed by finalizer, please review application shutdown logic.");
-            }
-        } finally {
-            super.finalize();
-        }
-    }
-
     /**
      * Sets the destroyed flag to true. The very first time this method is
      * called, it cleans up all its dependencies.  Even if you retain a
diff --git a/messagebus/src/main/java/com/yahoo/messagebus/network/rpc/RPCNetwork.java b/messagebus/src/main/java/com/yahoo/messagebus/network/rpc/RPCNetwork.java
index 99863b449be..c169bed3fa9 100644
--- a/messagebus/src/main/java/com/yahoo/messagebus/network/rpc/RPCNetwork.java
+++ b/messagebus/src/main/java/com/yahoo/messagebus/network/rpc/RPCNetwork.java
@@ -223,17 +223,6 @@ public class RPCNetwork implements Network, MethodHandler {
     }
 
     @Override
-    protected void finalize() throws Throwable {
-        try {
-            if (destroy()) {
-                log.log(LogLevel.WARNING, "RPCNetwork destroyed by finalizer, please review application shutdown logic.");
-            }
-        } finally {
-            super.finalize();
-        }
-    }
-
-    @Override
     public void send(Message msg, List<RoutingNode> recipients) {
         SendContext ctx = new SendContext(this, msg, recipients);
         double timeout = ctx.msg.getTimeRemainingNow() / 1000.0;
diff --git a/messagebus/src/main/java/com/yahoo/messagebus/network/rpc/test/TestServer.java b/messagebus/src/main/java/com/yahoo/messagebus/network/rpc/test/TestServer.java
index f36f7612f0e..d7ce31a5223 100644
--- a/messagebus/src/main/java/com/yahoo/messagebus/network/rpc/test/TestServer.java
+++ b/messagebus/src/main/java/com/yahoo/messagebus/network/rpc/test/TestServer.java
@@ -64,18 +64,6 @@ public class TestServer {
         mb = new MessageBus(net, mbusParams);
     }
 
-    // Overrides Object.
-    @Override
-    protected void finalize() throws Throwable {
-        try {
-            if (destroy()) {
-                log.log(LogLevel.WARNING, "TestServer destroyed by finalizer, please review application shutdown logic.");
-            }
-        } finally {
-            super.finalize();
-        }
-    }
-
     /**
      * Sets the destroyed flag to true. The very first time this method is called, it cleans up all its dependencies.
      * Even if you retain a reference to this object, all of its content is allowed to be garbage collected.