Minor cleanup of the Reference refactoring.

1 files changed, 7 insertions, 10 deletions

diff --git a/cpp/src/Ice/LocatorInfo.cpp b/cpp/src/Ice/LocatorInfo.cpp
index de67616c93a..a99a1c163c3 100644
--- a/cpp/src/Ice/LocatorInfo.cpp
+++ b/cpp/src/Ice/LocatorInfo.cpp
@@ -417,11 +417,7 @@ IceInternal::LocatorInfo::clearCache(const IndirectReferencePtr& ref)
 	    {
 	        if(!oir->getAdapterId().empty())
 		{
-		    IndirectReferencePtr ir = IndirectReferencePtr::dynamicCast(object->__reference());
-		    if(ir)
-		    {
-			clearCache(ir);
-		    }
+		    clearCache(oir);
 		}
 	    }
 	    else
@@ -436,18 +432,19 @@ IceInternal::LocatorInfo::clearCache(const IndirectReferencePtr& ref)
 }
 
 void
-IceInternal::LocatorInfo::trace(const string& msg, const ReferencePtr& ref, const vector<EndpointPtr>& endpoints)
+IceInternal::LocatorInfo::trace(const string& msg,
+	                        const IndirectReferencePtr& ref,
+				const vector<EndpointPtr>& endpoints)
 {
     Trace out(ref->getInstance()->logger(), ref->getInstance()->traceLevels()->locationCat);
     out << msg << '\n';
-    IndirectReferencePtr ir = IndirectReferencePtr::dynamicCast(ref);
-    if(!ir)
+    if(!ref->getAdapterId().empty())
     {
-	out << "object = "  << identityToString(ref->getIdentity()) << '\n';
+	out << "adapter = "  << ref->getAdapterId() << '\n';
     }
     else
     {
-	out << "adapter = "  << ir->getAdapterId() << '\n';
+	out << "object = "  << identityToString(ref->getIdentity()) << '\n';
     }
 
     const char* sep = endpoints.size() > 1 ? ":" : "";