Servant lookup fixes

1 files changed, 11 insertions, 5 deletions

diff --git a/cpp/src/Ice/Incoming.cpp b/cpp/src/Ice/Incoming.cpp
index f9a74512494..828948cc817 100644
--- a/cpp/src/Ice/Incoming.cpp
+++ b/cpp/src/Ice/Incoming.cpp
@@ -39,24 +39,30 @@ IceInternal::Incoming::invoke(Stream& is)
 
     Stream::Container::size_type statusPos = _os.b.size();
 
-    ObjectPtr servant = _adapter->identityToServant(identity);
+    ObjectPtr servant;
     ServantLocatorPtr locator;
     LocalObjectPtr cookie;
 
     try
     {
+	servant = _adapter->identityToServant(identity);
+
 	if (!servant)
 	{
 	    string::size_type pos = identity.find('#');
 	    if (pos != string::npos)
 	    {
 		locator = _adapter->findServantLocator(identity.substr(0, pos));
+		if (locator)
+		{
+		    servant = locator->locate(_adapter, identity, operation, cookie);
+		}
 	    }
-	    else
-	    {
-		locator = _adapter->findServantLocator("");
-	    }
+	}
 
+	if (!servant)
+	{
+	    locator = _adapter->findServantLocator("");
 	    if (locator)
 	    {
 		servant = locator->locate(_adapter, identity, operation, cookie);