diff options
| author | Jose <jose@zeroc.com> | 2012-01-03 22:35:03 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2012-01-03 22:35:03 +0100 |
| commit | f508d7d7cf7811062c5466efa2b3bf7f921947d8 (patch) | |
| tree | adcee43513be1f8a3a76db89857d6aa73a664842 /java/src/IceInternal/ObjectAdapterFactory.java | |
| parent | ICE-4744 Eclipse plugin: build failure when slice2java generates warning (diff) | |
| download | ice-f508d7d7cf7811062c5466efa2b3bf7f921947d8.tar.bz2 ice-f508d7d7cf7811062c5466efa2b3bf7f921947d8.tar.xz ice-f508d7d7cf7811062c5466efa2b3bf7f921947d8.zip | |
ICE-3318 Java finalizers are problematic
Diffstat (limited to 'java/src/IceInternal/ObjectAdapterFactory.java')
| -rw-r--r-- | java/src/IceInternal/ObjectAdapterFactory.java | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/java/src/IceInternal/ObjectAdapterFactory.java b/java/src/IceInternal/ObjectAdapterFactory.java index c9cb79a13ec..804c309328d 100644 --- a/java/src/IceInternal/ObjectAdapterFactory.java +++ b/java/src/IceInternal/ObjectAdapterFactory.java @@ -206,11 +206,19 @@ public final class ObjectAdapterFactory finalize() throws Throwable { - IceUtilInternal.Assert.FinalizerAssert(_instance == null); - IceUtilInternal.Assert.FinalizerAssert(_communicator == null); - //IceUtilInternal.Assert.FinalizerAssert(_adapters.isEmpty()) - - super.finalize(); + try + { + IceUtilInternal.Assert.FinalizerAssert(_instance == null); + IceUtilInternal.Assert.FinalizerAssert(_communicator == null); + IceUtilInternal.Assert.FinalizerAssert(_adapters.isEmpty()); + } + catch(java.lang.Exception ex) + { + } + finally + { + super.finalize(); + } } private Instance _instance; |