diff options
author | Jose <jose@zeroc.com> | 2008-12-17 20:47:15 +0100 |
---|---|---|
committer | Jose <jose@zeroc.com> | 2008-12-17 20:47:15 +0100 |
commit | 3ef4be01cfc76ca401cd1979103cd368e245dd5f (patch) | |
tree | 767c7b2b91b9d1f27771006d56cd4e09cf3cafc3 /java/src/Ice/ObjectAdapterI.java | |
parent | 3573 Build Freeze with DB-4.7 (diff) | |
download | ice-3ef4be01cfc76ca401cd1979103cd368e245dd5f.tar.bz2 ice-3ef4be01cfc76ca401cd1979103cd368e245dd5f.tar.xz ice-3ef4be01cfc76ca401cd1979103cd368e245dd5f.zip |
Remove Java finalizers code
Diffstat (limited to 'java/src/Ice/ObjectAdapterI.java')
-rw-r--r-- | java/src/Ice/ObjectAdapterI.java | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/java/src/Ice/ObjectAdapterI.java b/java/src/Ice/ObjectAdapterI.java index 5c6d7755cf1..61af2b359d6 100644 --- a/java/src/Ice/ObjectAdapterI.java +++ b/java/src/Ice/ObjectAdapterI.java @@ -355,9 +355,6 @@ public final class ObjectAdapterI implements ObjectAdapter // We're done, now we can throw away all incoming connection // factories. // - // For compatibility with C#, we set _incomingConnectionFactories - // to null so that the finalizer does not invoke methods on objects. - // _incomingConnectionFactories = null; // @@ -940,32 +937,6 @@ public final class ObjectAdapterI implements ObjectAdapter } } - protected synchronized void - finalize() - throws Throwable - { - if(!_deactivated) - { - _instance.initializationData().logger.warning("object adapter `" + getName() + - "' has not been deactivated"); - } - else if(!_destroyed) - { - _instance.initializationData().logger.warning("object adapter `" + getName() + "' has not been destroyed"); - } - else - { - IceUtilInternal.Assert.FinalizerAssert(_threadPool == null); - //IceUtilInternal.Assert.FinalizerAssert(_servantManager == null); // Not cleared, it needs to be immutable. - IceUtilInternal.Assert.FinalizerAssert(_communicator == null); - IceUtilInternal.Assert.FinalizerAssert(_incomingConnectionFactories == null); - IceUtilInternal.Assert.FinalizerAssert(_directCount == 0); - IceUtilInternal.Assert.FinalizerAssert(!_waitForActivate); - } - - super.finalize(); - } - private ObjectPrx newProxy(Identity ident, String facet) { |