changing IceUtil.Assert.Assert to IceUtil.Assert.FinalizerAssert

7 files changed, 31 insertions, 51 deletions

diff --git a/java/src/Ice/ConnectionI.java b/java/src/Ice/ConnectionI.java
index 6d978b53dbf..1a214f5cfff 100644
--- a/java/src/Ice/ConnectionI.java
+++ b/java/src/Ice/ConnectionI.java
@@ -1434,11 +1434,11 @@ public final class ConnectionI extends IceInternal.EventHandler implements Conne
     finalize()
         throws Throwable
     {
-	assert(IceUtil.Assert.Assert(_state == StateClosed));
-	assert(IceUtil.Assert.Assert(_transceiver == null));
-	assert(IceUtil.Assert.Assert(_dispatchCount == 0));
-	assert(IceUtil.Assert.Assert(_threadPerConnection == null));
-	assert(IceUtil.Assert.Assert(_incomingCache == null));
+	IceUtil.Assert.FinalizerAssert(_state == StateClosed);
+	IceUtil.Assert.FinalizerAssert(_transceiver == null);
+	IceUtil.Assert.FinalizerAssert(_dispatchCount == 0);
+	IceUtil.Assert.FinalizerAssert(_threadPerConnection == null);
+	IceUtil.Assert.FinalizerAssert(_incomingCache == null);
 
         super.finalize();
     }
diff --git a/java/src/IceInternal/EventHandler.java b/java/src/IceInternal/EventHandler.java
index b145f4408ba..8f2227ddd7b 100644
--- a/java/src/IceInternal/EventHandler.java
+++ b/java/src/IceInternal/EventHandler.java
@@ -73,7 +73,7 @@ public abstract class EventHandler
     finalize()
         throws Throwable
     {
-	assert(IceUtil.Assert.Assert(_stream == null));
+	IceUtil.Assert.FinalizerAssert(_stream == null);
     }
 
     protected Instance _instance;
diff --git a/java/src/IceInternal/IncomingConnectionFactory.java b/java/src/IceInternal/IncomingConnectionFactory.java
index 9c49b454d12..60911ecf5aa 100644
--- a/java/src/IceInternal/IncomingConnectionFactory.java
+++ b/java/src/IceInternal/IncomingConnectionFactory.java
@@ -466,10 +466,10 @@ public final class IncomingConnectionFactory extends EventHandler
     finalize()
         throws Throwable
     {
-	assert(IceUtil.Assert.Assert(_state == StateClosed));
-	assert(IceUtil.Assert.Assert(_acceptor == null));
-	assert(IceUtil.Assert.Assert(_connections == null));
-	assert(IceUtil.Assert.Assert(_threadPerIncomingConnectionFactory == null));
+	IceUtil.Assert.FinalizerAssert(_state == StateClosed);
+	IceUtil.Assert.FinalizerAssert(_acceptor == null);
+	IceUtil.Assert.FinalizerAssert(_connections == null);
+	IceUtil.Assert.FinalizerAssert(_threadPerIncomingConnectionFactory == null);
 
         super.finalize();
     }
diff --git a/java/src/IceUtil/Assert.java b/java/src/IceUtil/Assert.java
index 524a87a21f6..11a9866810a 100644
--- a/java/src/IceUtil/Assert.java
+++ b/java/src/IceUtil/Assert.java
@@ -11,21 +11,13 @@ package IceUtil;
 
 public final class Assert
 {
-    public static boolean
-    Assert(boolean b)
+    //
+    // The JVM ignores exceptions raised in finalizers, therefore finalizers
+    // that use assertions should call this method instead of assert().
+    //
+    public static void
+    FinalizerAssert(boolean b)
     {
-	//
-	// The JVM ignores exceptions raised in finalizers, therefore finalizers
-	// that use assertions should call this method. For example:
-	//
-	// protected void finalize() throws Throwable
-	// {
-	//     assert(IceUtil.Assert.Assert(condition));
-	// }
-	//
-	// Notice that this method is called from within an assert statement,
-	// which avoids the cost of the call if assertions are disabled.
-	//
 	if(!b)
 	{
 	    //
@@ -49,6 +41,5 @@ public final class Assert
 		System.err.println("Assertion failure (no stack trace information)");
 	    }
 	}
-	return true;
     }
 }
diff --git a/javae/src/Ice/ConnectionI.java b/javae/src/Ice/ConnectionI.java
index b213122337f..a00ab34a602 100644
--- a/javae/src/Ice/ConnectionI.java
+++ b/javae/src/Ice/ConnectionI.java
@@ -1012,13 +1012,11 @@ public final class ConnectionI implements Connection
     finalize()
         throws Throwable
     {
-	assert(IceUtil.Assert.Assert(_state == StateClosed));
-	assert(IceUtil.Assert.Assert(_transceiver == null));
-	assert(IceUtil.Assert.Assert(_dispatchCount == 0));
-	assert(IceUtil.Assert.Assert(_threadPerConnection == null));
-	assert(IceUtil.Assert.Assert(_incomingCache == null));
-
-        super.finalize();
+	IceUtil.Assert.FinalizerAssert(_state == StateClosed);
+	IceUtil.Assert.FinalizerAssert(_transceiver == null);
+	IceUtil.Assert.FinalizerAssert(_dispatchCount == 0);
+	IceUtil.Assert.FinalizerAssert(_threadPerConnection == null);
+	IceUtil.Assert.FinalizerAssert(_incomingCache == null);
     }
 
     private static final int StateNotValidated = 0;
diff --git a/javae/src/IceInternal/IncomingConnectionFactory.java b/javae/src/IceInternal/IncomingConnectionFactory.java
index 1c345680470..c01ce6a8b6c 100644
--- a/javae/src/IceInternal/IncomingConnectionFactory.java
+++ b/javae/src/IceInternal/IncomingConnectionFactory.java
@@ -296,10 +296,10 @@ public final class IncomingConnectionFactory
     finalize()
         throws Throwable
     {
-	assert(IceUtil.Assert.Assert(_state == StateClosed));
-	assert(IceUtil.Assert.Assert(_acceptor == null));
-	assert(IceUtil.Assert.Assert(_connections == null));
-	assert(IceUtil.Assert.Assert(_threadPerIncomingConnectionFactory == null));
+	IceUtil.Assert.FinalizerAssert(_state == StateClosed);
+	IceUtil.Assert.FinalizerAssert(_acceptor == null);
+	IceUtil.Assert.FinalizerAssert(_connections == null);
+	IceUtil.Assert.FinalizerAssert(_threadPerIncomingConnectionFactory == null);
     }
 
     private static final int StateActive = 0;
diff --git a/javae/src/IceUtil/Assert.java b/javae/src/IceUtil/Assert.java
index 1b56cfc5805..51a7f0be0e6 100644
--- a/javae/src/IceUtil/Assert.java
+++ b/javae/src/IceUtil/Assert.java
@@ -11,21 +11,13 @@ package IceUtil;
 
 public final class Assert
 {
-    public static boolean
-    Assert(boolean b)
+    //
+    // The JVM ignores exceptions raised in finalizers, therefore finalizers
+    // that use assertions should call this method.
+    //
+    public static void
+    FinalizerAssert(boolean b)
     {
-	//
-	// The JVM ignores exceptions raised in finalizers, therefore finalizers
-	// that use assertions should call this method. For example:
-	//
-	// protected void finalize() throws Throwable
-	// {
-	//     assert(IceUtil.Assert.Assert(condition));
-	// }
-	//
-	// Notice that this method is called from within an assert statement,
-	// which avoids the cost of the call if assertions are disabled.
-	//
 	if(!b)
 	{
 	    //
@@ -35,6 +27,5 @@ public final class Assert
 	    System.err.println("Assertion failure:");
 	    t.printStackTrace(System.err);
 	}
-	return true;
     }
 }