diff options
| author | Jose <jose@zeroc.com> | 2008-12-18 14:32:27 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2008-12-18 14:32:27 +0100 |
| commit | 57a0a4333fbb0b41cd7423b37b59534455a3173b (patch) | |
| tree | 174b28cf580405b213ae4da8fd96b2ca509bd9aa /java/src/IceInternal/ServantManager.java | |
| parent | Merge branch 'R3_3_branch'; commit 'origin/R3_3_branch' into R3_3_branch (diff) | |
| download | ice-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/ServantManager.java')
| -rw-r--r-- | java/src/IceInternal/ServantManager.java | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/java/src/IceInternal/ServantManager.java b/java/src/IceInternal/ServantManager.java index 931b383b7fe..8e4dcc1374a 100644 --- a/java/src/IceInternal/ServantManager.java +++ b/java/src/IceInternal/ServantManager.java @@ -199,6 +199,20 @@ public final class ServantManager _adapterName = adapterName; } + protected void + finalize() + throws Throwable + { + // + // Don't check whether destroy() has been called. It might have + // not been called if the associated object adapter was not + // properly deactivated. + // + //IceUtilInternal.Assert.FinalizerAssert(_instance == null); + + super.finalize(); + } + // // Only for use by Ice.ObjectAdapterI. // |