Author: schultz
Date: Wed Aug 27 15:53:36 2014
New Revision: 1620918
URL: http://svn.apache.org/r1620918
Log:
Back-ported r1620917
Moved resource-freeing code from finalize() to breakdown()
Have finalize() call breakdown() instead of vice-versa.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1620917
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java?rev=1620918&r1=1620917&r2=1620918&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
Wed Aug 27 15:53:36 2014
@@ -338,16 +338,6 @@ public abstract class AbstractReplicated
}
public void breakdown() {
- // 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() throws Throwable {
if (this.rpcChannel != null) {
this.rpcChannel.breakdown();
}
@@ -363,8 +353,15 @@ public abstract class AbstractReplicated
innerMap.clear();
this.stateTransferred = false;
this.externalLoaders = null;
+ }
- super.finalize();
+ @Override
+ public void finalize() throws Throwable {
+ try {
+ breakdown();
+ } finally {
+ super.finalize();
+ }
}
@Override
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
