svn commit: r1620915 - in /tomcat/trunk/java/org/apache: catalina/tribes/group/ catalina/tribes/tipis/ catalina/tribes/transport/bio/ catalina/tribes/transport/nio/ tomcat/jni/socket/

[schultz]

Author: schultz
Date: Wed Aug 27 15:42:25 2014
New Revision: 1620915

URL: http://svn.apache.org/r1620915
Log:
Add super.finalize to finalizers missing those calls.

Modified:
    tomcat/trunk/java/org/apache/catalina/tribes/group/RpcChannel.java
    
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
    
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/MultipointBioSender.java
    
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java
    tomcat/trunk/java/org/apache/tomcat/jni/socket/AprSocketContext.java

Modified: tomcat/trunk/java/org/apache/catalina/tribes/group/RpcChannel.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/RpcChannel.java?rev=1620915&r1=1620914&r2=1620915&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/group/RpcChannel.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/group/RpcChannel.java Wed Aug 
27 15:42:25 2014
@@ -175,8 +175,9 @@ public class RpcChannel implements Chann
     }
 
     @Override
-    public void finalize() {
+    public void finalize() throws Throwable {
         breakdown();
+        super.finalize();
     }
 
     @Override

Modified: 
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java?rev=1620915&r1=1620914&r2=1620915&view=diff
==============================================================================
--- 
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java 
(original)
+++ 
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java 
Wed Aug 27 15:42:25 2014
@@ -329,11 +329,16 @@ public abstract class AbstractReplicated
     }
 
     public void breakdown() {
-        finalize();
+        // TODO: Invert the call semantics between between breakdown() and 
finalize()
+        try {
+            finalize();
+        } catch (Throwable t) {
+            log.error("Call to finalize() failed", t);
+        }
     }
 
     @Override
-    public void finalize() {
+    public void finalize() throws Throwable {
         if (this.rpcChannel != null) {
             this.rpcChannel.breakdown();
         }
@@ -349,6 +354,8 @@ public abstract class AbstractReplicated
         innerMap.clear();
         this.stateTransferred = false;
         this.externalLoaders = null;
+
+        super.finalize();
     }
 
     @Override

Modified: 
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/MultipointBioSender.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/MultipointBioSender.java?rev=1620915&r1=1620914&r2=1620915&view=diff
==============================================================================
--- 
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/MultipointBioSender.java
 (original)
+++ 
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/MultipointBioSender.java
 Wed Aug 27 15:42:25 2014
@@ -125,8 +125,9 @@ public class MultipointBioSender extends
     }
 
     @Override
-    public void finalize() {
+    public void finalize() throws Throwable {
         try {disconnect(); }catch ( Exception e){/* Ignore */}
+        super.finalize();
     }
 
 

Modified: 
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java?rev=1620915&r1=1620914&r2=1620915&view=diff
==============================================================================
--- 
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java
 (original)
+++ 
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/ParallelNioSender.java
 Wed Aug 27 15:42:25 2014
@@ -302,7 +302,7 @@ public class ParallelNioSender extends A
     }
 
     @Override
-    public void finalize() {
+    public void finalize() throws Throwable {
         try {disconnect(); }catch ( Exception e){/*Ignore*/}
         try {
             selector.close();
@@ -311,6 +311,7 @@ public class ParallelNioSender extends A
                 log.debug("Failed to close selector", e);
             }
         }
+        super.finalize();
     }
 
     @Override

Modified: tomcat/trunk/java/org/apache/tomcat/jni/socket/AprSocketContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/jni/socket/AprSocketContext.java?rev=1620915&r1=1620914&r2=1620915&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/jni/socket/AprSocketContext.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/jni/socket/AprSocketContext.java Wed 
Aug 27 15:42:25 2014
@@ -494,7 +494,7 @@ public class AprSocketContext {
      * closed, but this seems simpler and safer.
      */
     @Override
-    protected void finalize() {
+    protected void finalize() throws Throwable {
         if (rootPool != 0) {
             log.warning(this + " GC without stop()");
             try {
@@ -504,6 +504,7 @@ public class AprSocketContext {
                 e.printStackTrace();
             }
         }
+        super.finalize();
     }
 
 



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org