1 files changed, 8 insertions, 1 deletions
diff --git a/java/src/IceInternal/EventHandler.java b/java/src/IceInternal/EventHandler.java
index ffe3bd7d3ab..43389373380 100644
--- a/java/src/IceInternal/EventHandler.java
+++ b/java/src/IceInternal/EventHandler.java
@@ -55,6 +55,13 @@ public abstract class EventHandler
         return _instance;
     }
 
+    public void
+    destroy()
+    {
+	_stream.destroy();
+	_stream = null;
+    }
+
     protected
     EventHandler(Instance instance)
     {
@@ -66,7 +73,7 @@ public abstract class EventHandler
     finalize()
         throws Throwable
     {
-	_stream.destroy();
+	assert(_stream == null);
     }
 
     protected Instance _instance;