summaryrefslogtreecommitdiff
path: root/cpp/src/IcePack/Forward.cpp
diff options
context:
space:
mode:
authorMarc Laukien <marc@zeroc.com>2001-08-25 01:37:09 +0000
committerMarc Laukien <marc@zeroc.com>2001-08-25 01:37:09 +0000
commita60f5311d60553dea75bffa5d3b38ec6b6eeee35 (patch)
treea4bbaa39b50f85a15b59b1a802a21a2c08a3d487 /cpp/src/IcePack/Forward.cpp
parentThreadPool fixes; Win fixes (diff)
downloadice-a60f5311d60553dea75bffa5d3b38ec6b6eeee35.tar.bz2
ice-a60f5311d60553dea75bffa5d3b38ec6b6eeee35.tar.xz
ice-a60f5311d60553dea75bffa5d3b38ec6b6eeee35.zip
fixes
Diffstat (limited to 'cpp/src/IcePack/Forward.cpp')
-rw-r--r--cpp/src/IcePack/Forward.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/cpp/src/IcePack/Forward.cpp b/cpp/src/IcePack/Forward.cpp
index 91162b5ef3a..a5bbc9197df 100644
--- a/cpp/src/IcePack/Forward.cpp
+++ b/cpp/src/IcePack/Forward.cpp
@@ -40,8 +40,7 @@ IcePack::Forward::locate(const ObjectAdapterPtr& adapter, const string& identity
//
// Look up the server description
//
- ObjectPrx proxy = adapter->identityToProxy(identity);
- ServerDescriptionPtr desc = _admin->find(proxy);
+ ServerDescriptionPtr desc = _admin->find(identity);
//
// If we didn't find a server description, we return null, meaning
@@ -52,6 +51,8 @@ IcePack::Forward::locate(const ObjectAdapterPtr& adapter, const string& identity
return 0;
}
+ ObjectPrx object = desc->object;
+
#ifndef WIN32
//
// We only try to activate if we have a path for the server
@@ -95,7 +96,7 @@ IcePack::Forward::locate(const ObjectAdapterPtr& adapter, const string& identity
// server timeout, a crash, or an explicit
// shutdown method.
//
- proxy->_ping();
+ object->_ping();
//
// Everything ok, the server is now up and
@@ -142,7 +143,7 @@ IcePack::Forward::locate(const ObjectAdapterPtr& adapter, const string& identity
}
#endif
- throw LocationForward(desc->object);
+ throw LocationForward(object);
}
void