10 files changed, 34 insertions, 33 deletions

diff --git a/java/src/Ice/ObjectAdapterI.java b/java/src/Ice/ObjectAdapterI.java
index 2064b0c1337..ce9ca070a6f 100644
--- a/java/src/Ice/ObjectAdapterI.java
+++ b/java/src/Ice/ObjectAdapterI.java
@@ -757,12 +757,12 @@ public final class ObjectAdapterI extends LocalObjectImpl implements ObjectAdapt
         }
 	else
 	{
-	    assert(_threadPool == null);
-	    assert(_servantManager == null);
-	    assert(_communicator == null);
-	    assert(_incomingConnectionFactories == null);
-	    assert(_directCount == 0);
-	    assert(!_waitForDeactivate);
+	    IceUtil.Assert.FinalizerAssert(_threadPool == null);
+	    IceUtil.Assert.FinalizerAssert(_servantManager == null);
+	    IceUtil.Assert.FinalizerAssert(_communicator == null);
+	    IceUtil.Assert.FinalizerAssert(_incomingConnectionFactories == null);
+	    IceUtil.Assert.FinalizerAssert(_directCount == 0);
+	    IceUtil.Assert.FinalizerAssert(!_waitForDeactivate);
 	}
 
         super.finalize();
diff --git a/java/src/IceInternal/ConnectionMonitor.java b/java/src/IceInternal/ConnectionMonitor.java
index 6dac428bf03..3f1c6307944 100644
--- a/java/src/IceInternal/ConnectionMonitor.java
+++ b/java/src/IceInternal/ConnectionMonitor.java
@@ -23,7 +23,7 @@ public final class ConnectionMonitor extends Thread
 	    assert(_instance != null);
 	    
 	    _instance = null;
-	    _connections.clear();
+	    _connections = null;
 	
 	    notify();
 	}
@@ -79,8 +79,8 @@ public final class ConnectionMonitor extends Thread
     finalize()
         throws Throwable
     {
-	assert(_instance == null);
-	assert(_connections.isEmpty());
+	IceUtil.Assert.FinalizerAssert(_instance == null);
+	IceUtil.Assert.FinalizerAssert(_connections == null);
 	
         super.finalize();
     }
diff --git a/java/src/IceInternal/Instance.java b/java/src/IceInternal/Instance.java
index 815eabe7ab3..1452951647b 100644
--- a/java/src/IceInternal/Instance.java
+++ b/java/src/IceInternal/Instance.java
@@ -452,19 +452,19 @@ public final class Instance
     finalize()
         throws Throwable
     {
-        assert(_destroyed);
-        assert(_referenceFactory == null);
-        assert(_proxyFactory == null);
-        assert(_outgoingConnectionFactory == null);
-	assert(_connectionMonitor == null);
-        assert(_servantFactoryManager == null);
-        assert(_objectAdapterFactory == null);
-        assert(_clientThreadPool == null);
-        assert(_serverThreadPool == null);
-        assert(_routerManager == null);
-        assert(_locatorManager == null);
-        assert(_endpointFactoryManager == null);
-        assert(_pluginManager == null);
+	IceUtil.Assert.FinalizerAssert(_destroyed);
+	IceUtil.Assert.FinalizerAssert(_referenceFactory == null);
+	IceUtil.Assert.FinalizerAssert(_proxyFactory == null);
+	IceUtil.Assert.FinalizerAssert(_outgoingConnectionFactory == null);
+	IceUtil.Assert.FinalizerAssert(_connectionMonitor == null);
+	IceUtil.Assert.FinalizerAssert(_servantFactoryManager == null);
+	IceUtil.Assert.FinalizerAssert(_objectAdapterFactory == null);
+	IceUtil.Assert.FinalizerAssert(_clientThreadPool == null);
+	IceUtil.Assert.FinalizerAssert(_serverThreadPool == null);
+	IceUtil.Assert.FinalizerAssert(_routerManager == null);
+	IceUtil.Assert.FinalizerAssert(_locatorManager == null);
+	IceUtil.Assert.FinalizerAssert(_endpointFactoryManager == null);
+	IceUtil.Assert.FinalizerAssert(_pluginManager == null);
 
         super.finalize();
     }
diff --git a/java/src/IceInternal/ObjectAdapterFactory.java b/java/src/IceInternal/ObjectAdapterFactory.java
index f570684cbd0..f3548057bb0 100644
--- a/java/src/IceInternal/ObjectAdapterFactory.java
+++ b/java/src/IceInternal/ObjectAdapterFactory.java
@@ -184,10 +184,10 @@ public final class ObjectAdapterFactory
     finalize()
         throws Throwable
     {
-	assert(_instance == null);
-	assert(_communicator == null);
-	assert(_adapters == null);
-	assert(!_waitForShutdown);
+	IceUtil.Assert.FinalizerAssert(_instance == null);
+	IceUtil.Assert.FinalizerAssert(_communicator == null);
+	IceUtil.Assert.FinalizerAssert(_adapters == null);
+	IceUtil.Assert.FinalizerAssert(!_waitForShutdown);
 
         super.finalize();
     }
diff --git a/java/src/IceInternal/OutgoingConnectionFactory.java b/java/src/IceInternal/OutgoingConnectionFactory.java
index 5d8d13a0277..80541ba15c1 100644
--- a/java/src/IceInternal/OutgoingConnectionFactory.java
+++ b/java/src/IceInternal/OutgoingConnectionFactory.java
@@ -546,8 +546,8 @@ public final class OutgoingConnectionFactory
     finalize()
         throws Throwable
     {
-        assert(_destroyed);
-	assert(_connections == null);
+	IceUtil.Assert.FinalizeAssert(_destroyed);
+	IceUtil.Assert.FinalizeAssert(_connections == null);
 
         super.finalize();
     }
diff --git a/java/src/IceInternal/ServantManager.java b/java/src/IceInternal/ServantManager.java
index ed805c6d4c6..cebdc782310 100644
--- a/java/src/IceInternal/ServantManager.java
+++ b/java/src/IceInternal/ServantManager.java
@@ -190,7 +190,7 @@ public final class ServantManager
 	// not been called if the associated object adapter was not
 	// properly deactivated.
 	//
-	//assert(_instance == null);
+	//IceUtil.Assert.FinalizerAssert(_instance == null);
 	
         super.finalize();
     }
diff --git a/java/src/IceInternal/TcpAcceptor.java b/java/src/IceInternal/TcpAcceptor.java
index 654c3fde933..8d3a0ca0f1f 100644
--- a/java/src/IceInternal/TcpAcceptor.java
+++ b/java/src/IceInternal/TcpAcceptor.java
@@ -138,7 +138,7 @@ class TcpAcceptor implements Acceptor
     finalize()
         throws Throwable
     {
-        assert(_fd == null);
+        IceUtil.Assert.FinalizerAssert(_fd == null);
 
         super.finalize();
     }
diff --git a/java/src/IceInternal/TcpTransceiver.java b/java/src/IceInternal/TcpTransceiver.java
index a7be7d9577e..a2d8339ca68 100644
--- a/java/src/IceInternal/TcpTransceiver.java
+++ b/java/src/IceInternal/TcpTransceiver.java
@@ -354,7 +354,7 @@ final class TcpTransceiver implements Transceiver
     finalize()
         throws Throwable
     {
-        assert(_fd == null);
+        IceUtil.Assert.FinalizerAssert(_fd == null);
 
         super.finalize();
     }
diff --git a/java/src/IceInternal/ThreadPool.java b/java/src/IceInternal/ThreadPool.java
index ac14d9fd97a..3da1c6d2084 100644
--- a/java/src/IceInternal/ThreadPool.java
+++ b/java/src/IceInternal/ThreadPool.java
@@ -126,7 +126,7 @@ public final class ThreadPool
     finalize()
         throws Throwable
     {
-        assert(_destroyed);
+        IceUtil.Assert.FinalizerAssert(_destroyed);
 
 	/**
 	  * For compatibility with C#, we do not invoke methods on other objects
diff --git a/java/src/IceInternal/UdpTransceiver.java b/java/src/IceInternal/UdpTransceiver.java
index 16ae2c707ca..f0ec4f7c3cb 100644
--- a/java/src/IceInternal/UdpTransceiver.java
+++ b/java/src/IceInternal/UdpTransceiver.java
@@ -407,7 +407,8 @@ final class UdpTransceiver implements Transceiver
     finalize()
         throws Throwable
     {
-        assert(_fd == null);
+        IceUtil.Assert.FinalizerAssert(_fd == null);
+
         super.finalize();
     }