Use communicator identityToStrng

9 files changed, 38 insertions, 26 deletions

diff --git a/java/src/Freeze/EvictorI.java b/java/src/Freeze/EvictorI.java
index dca95427e99..73842681a0e 100644
--- a/java/src/Freeze/EvictorI.java
+++ b/java/src/Freeze/EvictorI.java
@@ -552,7 +552,7 @@ class EvictorI extends Ice.LocalObjectImpl implements Evictor, Runnable
 	    {
 		Ice.AlreadyRegisteredException ex = new Ice.AlreadyRegisteredException();
 		ex.kindOfObject = "servant";
-		ex.id = Ice.Util.identityToString(ident);
+		ex.id = _communicator.identityToString(ident);
 		if(facet.length() > 0)
 		{
 		    ex.id += " -f " + IceUtil.StringUtil.escapeString(facet, "");
@@ -562,7 +562,7 @@ class EvictorI extends Ice.LocalObjectImpl implements Evictor, Runnable
 	    
 	    if(_trace >= 1)
 	    {
-		String objString = "object \"" + Ice.Util.identityToString(ident) + "\"";
+		String objString = "object \"" + _communicator.identityToString(ident) + "\"";
 		if(!facet.equals(""))
 		{
 		    objString += " with facet \"" + facet + "\"";
@@ -688,7 +688,7 @@ class EvictorI extends Ice.LocalObjectImpl implements Evictor, Runnable
 	    
 	    if(_trace >= 1)
 	    {
-		String objString = "object \"" + Ice.Util.identityToString(ident) + "\"";
+		String objString = "object \"" + _communicator.identityToString(ident) + "\"";
 		_communicator.getLogger().trace("Freeze.Evictor", "added or updated " + objString + " in the database");
 	    }
 	}
@@ -819,7 +819,7 @@ class EvictorI extends Ice.LocalObjectImpl implements Evictor, Runnable
 	    {
 		Ice.NotRegisteredException ex = new Ice.NotRegisteredException();
 		ex.kindOfObject = "servant";
-		ex.id = Ice.Util.identityToString(ident);
+		ex.id = _communicator.identityToString(ident);
 		if(facet.length() > 0)
 		{
 		    ex.id += " -f " + IceUtil.StringUtil.escapeString(facet, "");
@@ -829,7 +829,7 @@ class EvictorI extends Ice.LocalObjectImpl implements Evictor, Runnable
 	    
 	    if(_trace >= 1)
 	    {
-		String objString = "object \"" + Ice.Util.identityToString(ident) + "\"";
+		String objString = "object \"" + _communicator.identityToString(ident) + "\"";
 		if(!facet.equals(""))
 		{
 		    objString += " with facet \"" + facet + "\"";
@@ -956,7 +956,7 @@ class EvictorI extends Ice.LocalObjectImpl implements Evictor, Runnable
 	    {
 		Ice.NotRegisteredException ex = new Ice.NotRegisteredException();
 		ex.kindOfObject = "servant";
-		ex.id = Ice.Util.identityToString(ident);
+		ex.id = _communicator.identityToString(ident);
 		if(facet.length() > 0)
 		{
 		    ex.id += " -f " + IceUtil.StringUtil.escapeString(facet, "");
@@ -1029,7 +1029,7 @@ class EvictorI extends Ice.LocalObjectImpl implements Evictor, Runnable
 	    
 	    Ice.NotRegisteredException ex = new Ice.NotRegisteredException();
 	    ex.kindOfObject = "servant";
-	    ex.id = Ice.Util.identityToString(ident);
+	    ex.id = _communicator.identityToString(ident);
 	    if(facet.length() > 0)
 	    {
 		ex.id += " -f " + IceUtil.StringUtil.escapeString(facet, "");
@@ -1206,7 +1206,7 @@ class EvictorI extends Ice.LocalObjectImpl implements Evictor, Runnable
 		    if(_trace >= 3)
 		    {
 			_communicator.getLogger().trace(
-			    "Freeze.Evictor", "ice_ping found \"" + Ice.Util.identityToString(current.id) +
+			    "Freeze.Evictor", "ice_ping found \"" + _communicator.identityToString(current.id) +
 			    "\" with facet \"" + current.facet + "\"");
 		    }
 		    cookie.value = null;
@@ -1218,7 +1218,7 @@ class EvictorI extends Ice.LocalObjectImpl implements Evictor, Runnable
 		    {
 			_communicator.getLogger().trace(
 			    "Freeze.Evictor", "ice_ping raises FacetNotExistException for \"" +
-			    Ice.Util.identityToString(current.id)  + "\" with facet \"" + current.facet + "\"");
+			    _communicator.identityToString(current.id)  + "\" with facet \"" + current.facet + "\"");
 		    }
 		    
 		    throw new Ice.FacetNotExistException();
@@ -1229,7 +1229,7 @@ class EvictorI extends Ice.LocalObjectImpl implements Evictor, Runnable
 		    {
 			_communicator.getLogger().trace(
 			    "Freeze.Evictor", "ice_ping will raise ObjectNotExistException for \"" +
-			    Ice.Util.identityToString(current.id)  + "\" with facet \"" + current.facet + "\"");
+			    _communicator.identityToString(current.id)  + "\" with facet \"" + current.facet + "\"");
 		    }
 		    
 		    return null;
@@ -1284,7 +1284,7 @@ class EvictorI extends Ice.LocalObjectImpl implements Evictor, Runnable
 		if(_trace >= 2)
 		{
 		    _communicator.getLogger().trace("Freeze.Evictor", "locate could not find \"" +
-						    Ice.Util.identityToString(ident) + "\" in database \"" +
+						    _communicator.identityToString(ident) + "\" in database \"" +
 						    current.facet + "\"");
 		}
 		return null;
@@ -1308,7 +1308,7 @@ class EvictorI extends Ice.LocalObjectImpl implements Evictor, Runnable
 			if(_trace >= 2)
 			{
 			    _communicator.getLogger().trace("Freeze.Evictor", "locate found \"" +
-							    Ice.Util.identityToString(ident) +
+							    _communicator.identityToString(ident) +
 							    "\" in the cache for database \"" + current.facet +
 							    "\" but it was dead or destroyed");
 			}
@@ -1322,7 +1322,7 @@ class EvictorI extends Ice.LocalObjectImpl implements Evictor, Runnable
 		    if(_trace >= 2)
 		    {
 			_communicator.getLogger().trace("Freeze.Evictor", "locate found \"" +
-							Ice.Util.identityToString(ident) + "\" in database \"" +
+							_communicator.identityToString(ident) + "\" in database \"" +
 							current.facet + "\"");
 		    }
 
@@ -1938,7 +1938,7 @@ class EvictorI extends Ice.LocalObjectImpl implements Evictor, Runnable
 
 		if(_trace >= 2 || (_trace >= 1 && _evictorList.size() % 50 == 0))
 		{
-		    String objString = "object \"" + Ice.Util.identityToString(element.identity) + "\"";
+		    String objString = "object \"" + _communicator.identityToString(element.identity) + "\"";
 		    String facet = element.store.facet();
 		    if(facet.length() > 0)
 		    {
diff --git a/java/src/Ice/CommunicatorI.java b/java/src/Ice/CommunicatorI.java
index d62eb60ad41..71765bb63cf 100644
--- a/java/src/Ice/CommunicatorI.java
+++ b/java/src/Ice/CommunicatorI.java
@@ -44,13 +44,13 @@ public final class CommunicatorI extends LocalObjectImpl implements Communicator
     public Ice.Identity
     stringToIdentity(String s)
     {
-        return Ice.Util.stringToIdentity(s);
+        return _instance.stringToIdentity(s);
     }
 
     public String
     identityToString(Ice.Identity ident)
     {
-        return Ice.Util.identityToString(ident);
+        return _instance.identityToString(ident);
     }
 
     public ObjectAdapter
diff --git a/java/src/Ice/ObjectAdapterI.java b/java/src/Ice/ObjectAdapterI.java
index 35332640959..821b750403c 100644
--- a/java/src/Ice/ObjectAdapterI.java
+++ b/java/src/Ice/ObjectAdapterI.java
@@ -745,7 +745,7 @@ public final class ObjectAdapterI extends LocalObjectImpl implements ObjectAdapt
 		    if(_routerInfo.getAdapter() != null)
 		    {
 		        throw new AlreadyRegisteredException("object adapter with router", 
-							     Ice.Util.identityToString(router.ice_getIdentity()));
+							     _instance.identityToString(router.ice_getIdentity()));
 		    }
 
                     //
diff --git a/java/src/IceInternal/IncomingBase.java b/java/src/IceInternal/IncomingBase.java
index f32bbaa8809..71bf13934a4 100644
--- a/java/src/IceInternal/IncomingBase.java
+++ b/java/src/IceInternal/IncomingBase.java
@@ -119,7 +119,7 @@ public class IncomingBase
 	IceUtil.OutputBase out = new IceUtil.OutputBase(pw);
 	out.setUseTab(false);
 	out.print("dispatch exception:");
-	out.print("\nidentity: " + Ice.Util.identityToString(_current.id));
+	out.print("\nidentity: " + _os.instance().identityToString(_current.id));
 	out.print("\nfacet: " + IceUtil.StringUtil.escapeString(_current.facet, ""));
 	out.print("\noperation: " + _current.operation);
 	out.print("\n");
diff --git a/java/src/IceInternal/Instance.java b/java/src/IceInternal/Instance.java
index 81d0cc61c73..aeee58f1d23 100644
--- a/java/src/IceInternal/Instance.java
+++ b/java/src/IceInternal/Instance.java
@@ -234,6 +234,18 @@ public final class Instance
 	adapterFactory.flushBatchRequests();
     }
 
+    public Ice.Identity
+    stringToIdentity(String s)
+    {
+        return Ice.Util.stringToIdentity(s);
+    }
+
+    public String
+    identityToString(Ice.Identity ident)
+    {
+        return Ice.Util.identityToString(ident);
+    }
+
     //
     // Only for use by Ice.CommunicatorI
     //
diff --git a/java/src/IceInternal/LocatorInfo.java b/java/src/IceInternal/LocatorInfo.java
index 6741705298a..d486c7ef0d3 100644
--- a/java/src/IceInternal/LocatorInfo.java
+++ b/java/src/IceInternal/LocatorInfo.java
@@ -151,7 +151,7 @@ public final class LocatorInfo
 	{
 	    Ice.NotRegisteredException e = new Ice.NotRegisteredException();
 	    e.kindOfObject = "object";
-	    e.id = Ice.Util.identityToString(identity);
+	    e.id = ref.getInstance().identityToString(identity);
 	    throw e;
 	}
 	catch(Ice.NotRegisteredException ex)
@@ -170,7 +170,7 @@ public final class LocatorInfo
 		}
 		else
 		{
-		    s.append("object = " + Ice.Util.identityToString(identity) + "\n");
+		    s.append("object = " + ref.getInstance().identityToString(identity) + "\n");
 		}
 		s.append("reason = " + ex);
 		ref.getInstance().initializationData().logger.trace(
@@ -270,7 +270,7 @@ public final class LocatorInfo
 	}
 	else
 	{
-	    s.append("object = " + Ice.Util.identityToString(ref.getIdentity()) + "\n");
+	    s.append("object = " + ref.getInstance().identityToString(ref.getIdentity()) + "\n");
 	}
 
 	s.append("endpoints = ");
diff --git a/java/src/IceInternal/Reference.java b/java/src/IceInternal/Reference.java
index 8fa583f540e..fd124f1cce3 100644
--- a/java/src/IceInternal/Reference.java
+++ b/java/src/IceInternal/Reference.java
@@ -244,7 +244,7 @@ public abstract class Reference implements Cloneable
         // the reference parser uses as separators, then we enclose
         // the identity string in quotes.
         //
-        String id = Ice.Util.identityToString(_identity);
+        String id = _instance.identityToString(_identity);
         if(IceUtil.StringUtil.findFirstOf(id, " \t\n\r:@") != -1)
         {
             s.append('"');
diff --git a/java/src/IceInternal/ServantManager.java b/java/src/IceInternal/ServantManager.java
index 1afedd6f538..948365dc709 100644
--- a/java/src/IceInternal/ServantManager.java
+++ b/java/src/IceInternal/ServantManager.java
@@ -32,7 +32,7 @@ public final class ServantManager
             if(m.containsKey(facet))
             {
                 Ice.AlreadyRegisteredException ex = new Ice.AlreadyRegisteredException();
-                ex.id = Ice.Util.identityToString(ident);
+                ex.id = _instance.identityToString(ident);
                 ex.kindOfObject = "servant";
                 if(facet.length() > 0)
                 {
@@ -60,7 +60,7 @@ public final class ServantManager
         if(m == null || (obj = (Ice.Object)m.remove(facet)) == null)
 	{
 	    Ice.NotRegisteredException ex = new Ice.NotRegisteredException();
-	    ex.id = Ice.Util.identityToString(ident);
+	    ex.id = _instance.identityToString(ident);
 	    ex.kindOfObject = "servant";
             if(facet.length() > 0)
             {
@@ -85,7 +85,7 @@ public final class ServantManager
         if(m == null)
 	{
 	    Ice.NotRegisteredException ex = new Ice.NotRegisteredException();
-	    ex.id = Ice.Util.identityToString(ident);
+	    ex.id = _instance.identityToString(ident);
 	    ex.kindOfObject = "servant";
 	    throw ex;
 	}
diff --git a/java/src/IceInternal/TraceUtil.java b/java/src/IceInternal/TraceUtil.java
index d9f687e950a..4daaf2f269b 100644
--- a/java/src/IceInternal/TraceUtil.java
+++ b/java/src/IceInternal/TraceUtil.java
@@ -285,7 +285,7 @@ public final class TraceUtil
         {
             Ice.Identity identity = new Ice.Identity();
             identity.__read(stream);
-            out.write("\nidentity = " + Ice.Util.identityToString(identity));
+            out.write("\nidentity = " + stream.instance().identityToString(identity));
 
             String[] facet = stream.readStringSeq();
             out.write("\nfacet = ");