From cf6d7ca679baa07b64bea6dce9dbc40b8bce14e9 Mon Sep 17 00:00:00 2001
From: Marc Laukien <marc@zeroc.com>
Date: Mon, 1 Oct 2001 17:02:38 +0000
Subject: Servant lookup fixes

---
 cpp/src/Ice/Direct.cpp   | 16 ++++++++++------
 cpp/src/Ice/Incoming.cpp | 16 +++++++++++-----
 2 files changed, 21 insertions(+), 11 deletions(-)

(limited to 'cpp/src')

diff --git a/cpp/src/Ice/Direct.cpp b/cpp/src/Ice/Direct.cpp
index c8a40bf63eb..d1efbf2cb69 100644
--- a/cpp/src/Ice/Direct.cpp
+++ b/cpp/src/Ice/Direct.cpp
@@ -23,22 +23,26 @@ IceInternal::Direct::Direct(const ObjectAdapterPtr& adapter, const ReferencePtr&
     _reference(ref),
     _operation(operation)
 {
-    _servant = _adapter->identityToServant(_reference->identity);
-    
     try
     {
+	_servant = _adapter->identityToServant(_reference->identity);
+    
 	if (!_servant)
 	{
 	    string::size_type pos = _reference->identity.find('#');
 	    if (pos != string::npos)
 	    {
 		_locator = _adapter->findServantLocator(_reference->identity.substr(0, pos));
+		if (_locator)
+		{
+		    _servant = _locator->locate(_adapter, _reference->identity, _operation, _cookie);
+		}
 	    }
-	    else
-	    {
-		_locator = _adapter->findServantLocator("");
-	    }
+	}
 
+	if (!_servant)
+	{
+	    _locator = _adapter->findServantLocator("");
 	    if (_locator)
 	    {
 		_servant = _locator->locate(_adapter, _reference->identity, _operation, _cookie);
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);
-- 
cgit v1.2.3