diff options
author | Marc Laukien <marc@zeroc.com> | 2001-10-01 02:28:14 +0000 |
---|---|---|
committer | Marc Laukien <marc@zeroc.com> | 2001-10-01 02:28:14 +0000 |
commit | af6ee090545af2480f22c91d84bb4f8aba43d052 (patch) | |
tree | c9f8af9f44a14df699f9999b4933cd556f8bc951 /cpp/src/Ice/Direct.cpp | |
parent | some doc fixes (diff) | |
download | ice-af6ee090545af2480f22c91d84bb4f8aba43d052.tar.bz2 ice-af6ee090545af2480f22c91d84bb4f8aba43d052.tar.xz ice-af6ee090545af2480f22c91d84bb4f8aba43d052.zip |
servant factory/locator management changes
Diffstat (limited to 'cpp/src/Ice/Direct.cpp')
-rw-r--r-- | cpp/src/Ice/Direct.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/cpp/src/Ice/Direct.cpp b/cpp/src/Ice/Direct.cpp index 59a57e1a4d0..c8a40bf63eb 100644 --- a/cpp/src/Ice/Direct.cpp +++ b/cpp/src/Ice/Direct.cpp @@ -29,7 +29,16 @@ IceInternal::Direct::Direct(const ObjectAdapterPtr& adapter, const ReferencePtr& { if (!_servant) { - _locator = _adapter->getServantLocator(); + string::size_type pos = _reference->identity.find('#'); + if (pos != string::npos) + { + _locator = _adapter->findServantLocator(_reference->identity.substr(0, pos)); + } + else + { + _locator = _adapter->findServantLocator(""); + } + if (_locator) { _servant = _locator->locate(_adapter, _reference->identity, _operation, _cookie); |