summaryrefslogtreecommitdiff
path: root/java/src/IceInternal/Timer.java
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2012-01-03 22:35:03 +0100
committerJose <jose@zeroc.com>2012-01-03 22:35:03 +0100
commitf508d7d7cf7811062c5466efa2b3bf7f921947d8 (patch)
treeadcee43513be1f8a3a76db89857d6aa73a664842 /java/src/IceInternal/Timer.java
parentICE-4744 Eclipse plugin: build failure when slice2java generates warning (diff)
downloadice-f508d7d7cf7811062c5466efa2b3bf7f921947d8.tar.bz2
ice-f508d7d7cf7811062c5466efa2b3bf7f921947d8.tar.xz
ice-f508d7d7cf7811062c5466efa2b3bf7f921947d8.zip
ICE-3318 Java finalizers are problematic
Diffstat (limited to 'java/src/IceInternal/Timer.java')
-rw-r--r--java/src/IceInternal/Timer.java14
1 files changed, 11 insertions, 3 deletions
diff --git a/java/src/IceInternal/Timer.java b/java/src/IceInternal/Timer.java
index a97486d92dc..957bcc14a71 100644
--- a/java/src/IceInternal/Timer.java
+++ b/java/src/IceInternal/Timer.java
@@ -132,9 +132,17 @@ public final class Timer extends Thread
finalize()
throws Throwable
{
- IceUtilInternal.Assert.FinalizerAssert(_instance == null);
-
- super.finalize();
+ try
+ {
+ IceUtilInternal.Assert.FinalizerAssert(_instance == null);
+ }
+ catch(java.lang.Exception ex)
+ {
+ }
+ finally
+ {
+ super.finalize();
+ }
}
public void