summaryrefslogtreecommitdiff
path: root/java/src/IceInternal/ObjectAdapterFactory.java
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2008-12-18 14:32:27 +0100
committerJose <jose@zeroc.com>2008-12-18 14:32:27 +0100
commit57a0a4333fbb0b41cd7423b37b59534455a3173b (patch)
tree174b28cf580405b213ae4da8fd96b2ca509bd9aa /java/src/IceInternal/ObjectAdapterFactory.java
parentMerge branch 'R3_3_branch'; commit 'origin/R3_3_branch' into R3_3_branch (diff)
downloadice-57a0a4333fbb0b41cd7423b37b59534455a3173b.tar.bz2
ice-57a0a4333fbb0b41cd7423b37b59534455a3173b.tar.xz
ice-57a0a4333fbb0b41cd7423b37b59534455a3173b.zip
Revert "Remove Java finalizers code"
This reverts commit 94e1da6dc82a8ed38ee7a5691d691d375aaa28cb.
Diffstat (limited to 'java/src/IceInternal/ObjectAdapterFactory.java')
-rw-r--r--java/src/IceInternal/ObjectAdapterFactory.java12
1 files changed, 12 insertions, 0 deletions
diff --git a/java/src/IceInternal/ObjectAdapterFactory.java b/java/src/IceInternal/ObjectAdapterFactory.java
index e6a1790324a..9dd4779930f 100644
--- a/java/src/IceInternal/ObjectAdapterFactory.java
+++ b/java/src/IceInternal/ObjectAdapterFactory.java
@@ -262,6 +262,18 @@ public final class ObjectAdapterFactory
_waitForShutdown = false;
}
+ protected synchronized void
+ finalize()
+ throws Throwable
+ {
+ IceUtilInternal.Assert.FinalizerAssert(_instance == null);
+ IceUtilInternal.Assert.FinalizerAssert(_communicator == null);
+ IceUtilInternal.Assert.FinalizerAssert(_adapters == null);
+ IceUtilInternal.Assert.FinalizerAssert(!_waitForShutdown);
+
+ super.finalize();
+ }
+
private Instance _instance;
private Ice.Communicator _communicator;
private java.util.Map<String, Ice.ObjectAdapterI> _adapters = new java.util.HashMap<String, Ice.ObjectAdapterI>();