Bug 467.

6 files changed, 91 insertions, 162 deletions

diff --git a/java/src/Freeze/EvictorI.java b/java/src/Freeze/EvictorI.java
index 1bd9f2b7b01..208ac3b4e13 100644
--- a/java/src/Freeze/EvictorI.java
+++ b/java/src/Freeze/EvictorI.java
@@ -425,14 +425,7 @@ class EvictorI extends Ice.LocalObjectImpl implements Evictor, Runnable
 	//
 	// Need to clone in case the given ident changes.
 	//
-	try
-	{
-	    ident = (Ice.Identity) ident.clone();
-	}
-	catch(CloneNotSupportedException ex)
-	{
-	    assert false;
-	}
+	ident = (Ice.Identity) ident.clone();
 
 	_deactivateController.lock();
 
@@ -605,14 +598,7 @@ class EvictorI extends Ice.LocalObjectImpl implements Evictor, Runnable
 	//
 	// Need to clone in case the given ident changes.
 	//
-	try
-	{
-	    ident = (Ice.Identity) ident.clone();
-	}
-	catch(CloneNotSupportedException ex)
-	{
-	    assert false;
-	}
+	ident = (Ice.Identity) ident.clone();
 
 	_deactivateController.lock();
 	
@@ -736,14 +722,7 @@ class EvictorI extends Ice.LocalObjectImpl implements Evictor, Runnable
 	//
 	// Need to clone in case the given ident changes.
 	//
-	try
-	{
-	    ident = (Ice.Identity) ident.clone();
-	}
-	catch(CloneNotSupportedException ex)
-	{
-	    assert false;
-	}
+	ident = (Ice.Identity) ident.clone();
 	
 	_deactivateController.lock();
 
@@ -1295,95 +1274,88 @@ class EvictorI extends Ice.LocalObjectImpl implements Evictor, Runnable
     Ice.Object
     locateImpl(Ice.Current current, Ice.LocalObjectHolder cookie)
     {
-	 cookie.value = null;
-	 
-	 //
-	 // Need to clone as current.id gets reused
-	 //
-	 Ice.Identity ident = null;
-	 try
-	 {
-	      ident = (Ice.Identity) current.id.clone();
-	 }
-	 catch(CloneNotSupportedException ex)
-	 {
-	     assert false;
-	 }
-
-	 ObjectStore store = findStore(current.facet);
-	 if(store == null)
-	 {
-	     if(_trace >= 2)
-	     {
-		 _communicator.getLogger().trace(
-		     "Freeze.Evictor",
-		     "locate could not find a database for facet \"" + current.facet + "\"");
-	     }
-	     return null;
-	 }
-	 
-	 for(;;)
-	 {
-	     EvictorElement element = (EvictorElement) store.cache().pin(ident);
-	     if(element == null)
-	     {
-		 if(_trace >= 2)
-		 {
-		     _communicator.getLogger().trace(
-			 "Freeze.Evictor",
-			 "locate could not find \"" + Ice.Util.identityToString(ident) 
-			 + "\" in database \"" + current.facet + "\"");
-		 }
-		 return null;
-	     }
-	     
-	     synchronized(this)
-	     {	     
-		 if(element.stale)
-		 {
-		     //
-		     // try again
-		     //
-		     continue;
-		 }
-	     
-		 synchronized(element)
-		 {
-		     if(element.status == EvictorElement.destroyed || 
-			element.status == EvictorElement.dead)
-		     {
-			 if(_trace >= 2)
-			 {
-			     _communicator.getLogger().trace(
-				 "Freeze.Evictor",
-				 "locate found \"" + Ice.Util.identityToString(ident) 
-				 + "\" in the cache for database \"" + current.facet 
-				 + "\" but it was dead or destroyed");
-			 }
-			 return null;
-		     }
-		 
-		     //
-		     // It's a good one!
-		     //
-		     
-		     
-		     if(_trace >= 2)
-		     {
-			 _communicator.getLogger().trace(
-			     "Freeze.Evictor",
-			     "locate found \"" + Ice.Util.identityToString(ident) 
-			     + "\" in database \"" + current.facet + "\"");
-		     }
-		     
-		     fixEvictPosition(element);
-		     element.usageCount++;
-		     cookie.value = element;
-		     assert element.rec.servant != null;
-		     return element.rec.servant;
-		 }
-	     }
-	 } 
+	cookie.value = null;
+
+	//
+	// Need to clone as current.id gets reused
+	//
+	Ice.Identity ident = null;
+	ident = (Ice.Identity) current.id.clone();
+
+	ObjectStore store = findStore(current.facet);
+	if(store == null)
+	{
+	    if(_trace >= 2)
+	    {
+		_communicator.getLogger().trace(
+		    "Freeze.Evictor",
+		    "locate could not find a database for facet \"" + current.facet + "\"");
+	    }
+	    return null;
+	}
+
+	for(;;)
+	{
+	    EvictorElement element = (EvictorElement) store.cache().pin(ident);
+	    if(element == null)
+	    {
+		if(_trace >= 2)
+		{
+		    _communicator.getLogger().trace(
+			"Freeze.Evictor",
+			"locate could not find \"" + Ice.Util.identityToString(ident) 
+			+ "\" in database \"" + current.facet + "\"");
+		}
+		return null;
+	    }
+
+	    synchronized(this)
+	    {	     
+		if(element.stale)
+		{
+		    //
+		    // try again
+		    //
+		    continue;
+		}
+
+		synchronized(element)
+		{
+		    if(element.status == EvictorElement.destroyed || 
+		    element.status == EvictorElement.dead)
+		    {
+			if(_trace >= 2)
+			{
+			    _communicator.getLogger().trace(
+				"Freeze.Evictor",
+				"locate found \"" + Ice.Util.identityToString(ident) 
+				+ "\" in the cache for database \"" + current.facet 
+				+ "\" but it was dead or destroyed");
+			}
+			return null;
+		    }
+
+		    //
+		    // It's a good one!
+		    //
+
+
+		    if(_trace >= 2)
+		    {
+			_communicator.getLogger().trace(
+			    "Freeze.Evictor",
+			    "locate found \"" + Ice.Util.identityToString(ident) 
+			    + "\" in database \"" + current.facet + "\"");
+		    }
+
+		    fixEvictPosition(element);
+		    element.usageCount++;
+		    cookie.value = element;
+		    assert element.rec.servant != null;
+		    return element.rec.servant;
+		}
+	    }
+	} 
     }
 
     public void
@@ -2227,14 +2199,7 @@ class EvictorI extends Ice.LocalObjectImpl implements Evictor, Runnable
         {
             Ice.IllegalIdentityException e = 
 		new Ice.IllegalIdentityException();
-            try
-            {
-                e.id = (Ice.Identity)ident.clone();
-            }
-            catch(CloneNotSupportedException ex)
-            {
-                assert(false);
-            }
+	    e.id = (Ice.Identity)ident.clone();
             throw e;
         }
     }
diff --git a/java/src/Ice/ObjectAdapterI.java b/java/src/Ice/ObjectAdapterI.java
index 09cd32eef9a..a7000f4c7f1 100644
--- a/java/src/Ice/ObjectAdapterI.java
+++ b/java/src/Ice/ObjectAdapterI.java
@@ -963,14 +963,7 @@ public final class ObjectAdapterI extends LocalObjectImpl implements ObjectAdapt
         if(ident.name == null || ident.name.length() == 0)
         {
             IllegalIdentityException e = new IllegalIdentityException();
-            try
-            {
-                e.id = (Identity)ident.clone();
-            }
-            catch(CloneNotSupportedException ex)
-            {
-                assert(false);
-            }
+	    e.id = (Identity)ident.clone();
             throw e;
         }
 
diff --git a/java/src/IceGrid/TreeNode/Adapter.java b/java/src/IceGrid/TreeNode/Adapter.java
index 317e6cbc84c..b398dbda649 100755
--- a/java/src/IceGrid/TreeNode/Adapter.java
+++ b/java/src/IceGrid/TreeNode/Adapter.java
@@ -97,15 +97,7 @@ class Adapter extends Leaf
 

     public Object copy()

     {

-	try

-	{

-	    return _descriptor.clone();

-	}

-	catch(CloneNotSupportedException e)

-	{

-	    assert false;

-	    return null;

-	}

+	return _descriptor.clone();

     }

 

 

diff --git a/java/src/IceGrid/TreeNode/AdapterEditor.java b/java/src/IceGrid/TreeNode/AdapterEditor.java
index ff1e6cafe73..9743ca6e4d7 100755
--- a/java/src/IceGrid/TreeNode/AdapterEditor.java
+++ b/java/src/IceGrid/TreeNode/AdapterEditor.java
@@ -338,14 +338,7 @@ class AdapterEditor extends Editor
 		    // Save to be able to rollback

 		    //

 		    AdapterDescriptor oldDescriptor = null;

-		    try

-		    {

-			oldDescriptor = (AdapterDescriptor)descriptor.clone();

-		    }

-		    catch(CloneNotSupportedException ce)

-		    {

-			assert false; // impossible

-		    }

+		    oldDescriptor = (AdapterDescriptor)descriptor.clone();

 		    

 		    TreePath oldPath = _adapter.getPath();

 		    Adapters parent = (Adapters)_adapter.getParent();

diff --git a/java/src/IceGrid/TreeNode/Adapters.java b/java/src/IceGrid/TreeNode/Adapters.java
index 25a15de2bd0..acb19c48cad 100755
--- a/java/src/IceGrid/TreeNode/Adapters.java
+++ b/java/src/IceGrid/TreeNode/Adapters.java
@@ -120,14 +120,7 @@ class Adapters extends Parent
 	if(canHaveNewChild() && descriptor instanceof AdapterDescriptor)

 	{

 	    AdapterDescriptor d = (AdapterDescriptor)descriptor;

-	    try

-	    {

-		newAdapter((AdapterDescriptor)d.clone());

-	    }

-	    catch(CloneNotSupportedException e)

-	    {

-		assert false;

-	    }

+	    newAdapter((AdapterDescriptor)d.clone());

 	}

     }

 

diff --git a/java/src/IceInternal/Reference.java b/java/src/IceInternal/Reference.java
index feb7f54cb24..6251e89a163 100644
--- a/java/src/IceInternal/Reference.java
+++ b/java/src/IceInternal/Reference.java
@@ -111,14 +111,7 @@ public abstract class Reference implements Cloneable
 	    return this;
 	}
 	Reference r = _instance.referenceFactory().copy(this);
-	try
-	{
-	    r._identity = (Ice.Identity)newIdentity.clone();
-	}
-	catch(CloneNotSupportedException ex)
-	{
-	    assert(false);
-	}
+	r._identity = (Ice.Identity)newIdentity.clone();
 	return r;
     }