diff options
| author | Mark Spruiell <mes@zeroc.com> | 2004-11-12 15:16:15 +0000 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2004-11-12 15:16:15 +0000 |
| commit | dd4bf618f09d904741cc6f89b828fac24d7b83a5 (patch) | |
| tree | 995e9fb40f565ba147b8d0f61aaafa6eb4886b6a /cpp/src | |
| parent | Added IcePack simple demo for VB. (diff) | |
| download | ice-dd4bf618f09d904741cc6f89b828fac24d7b83a5.tar.bz2 ice-dd4bf618f09d904741cc6f89b828fac24d7b83a5.tar.xz ice-dd4bf618f09d904741cc6f89b828fac24d7b83a5.zip | |
proxy returned by addFacet/addFacetWithUUID did not contain the facet
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/Ice/ObjectAdapterI.cpp | 18 | ||||
| -rw-r--r-- | cpp/src/Ice/ObjectAdapterI.h | 4 |
2 files changed, 11 insertions, 11 deletions
diff --git a/cpp/src/Ice/ObjectAdapterI.cpp b/cpp/src/Ice/ObjectAdapterI.cpp index aef8746454d..9151d0b33fd 100644 --- a/cpp/src/Ice/ObjectAdapterI.cpp +++ b/cpp/src/Ice/ObjectAdapterI.cpp @@ -119,7 +119,7 @@ Ice::ObjectAdapterI::activate() { Identity ident; ident.name = "dummy"; - locatorRegistry->setAdapterDirectProxy(_id, newDirectProxy(ident)); + locatorRegistry->setAdapterDirectProxy(_id, newDirectProxy(ident, "")); } catch(const Ice::AdapterNotFoundException&) { @@ -316,7 +316,7 @@ Ice::ObjectAdapterI::addFacet(const ObjectPtr& object, const Identity& ident, co _servantManager->addServant(object, ident, facet); - return newProxy(ident); + return newProxy(ident, facet); } ObjectPrx @@ -428,7 +428,7 @@ Ice::ObjectAdapterI::createProxy(const Identity& ident) const checkForDeactivation(); checkIdentity(ident); - return newProxy(ident); + return newProxy(ident, ""); } ObjectPrx @@ -439,7 +439,7 @@ Ice::ObjectAdapterI::createDirectProxy(const Identity& ident) const checkForDeactivation(); checkIdentity(ident); - return newDirectProxy(ident); + return newDirectProxy(ident, ""); } ObjectPrx @@ -758,18 +758,18 @@ Ice::ObjectAdapterI::~ObjectAdapterI() } ObjectPrx -Ice::ObjectAdapterI::newProxy(const Identity& ident) const +Ice::ObjectAdapterI::newProxy(const Identity& ident, const string& facet) const { if(_id.empty()) { - return newDirectProxy(ident); + return newDirectProxy(ident, facet); } else { // // Create a reference with the adapter id. // - ReferencePtr ref = _instance->referenceFactory()->create(ident, Context(), "", + ReferencePtr ref = _instance->referenceFactory()->create(ident, Context(), facet, Reference::ModeTwoway, false, _id, 0, _locatorInfo, true); @@ -781,7 +781,7 @@ Ice::ObjectAdapterI::newProxy(const Identity& ident) const } ObjectPrx -Ice::ObjectAdapterI::newDirectProxy(const Identity& ident) const +Ice::ObjectAdapterI::newDirectProxy(const Identity& ident, const string& facet) const { vector<EndpointPtr> endpoints; @@ -809,7 +809,7 @@ Ice::ObjectAdapterI::newDirectProxy(const Identity& ident) const // // Create a reference and return a proxy for this reference. // - ReferencePtr ref = _instance->referenceFactory()->create(ident, Context(), "", Reference::ModeTwoway, + ReferencePtr ref = _instance->referenceFactory()->create(ident, Context(), facet, Reference::ModeTwoway, false, endpoints, 0, true); return _instance->proxyFactory()->referenceToProxy(ref); diff --git a/cpp/src/Ice/ObjectAdapterI.h b/cpp/src/Ice/ObjectAdapterI.h index d71077efc43..fa3859a248e 100644 --- a/cpp/src/Ice/ObjectAdapterI.h +++ b/cpp/src/Ice/ObjectAdapterI.h @@ -88,8 +88,8 @@ private: virtual ~ObjectAdapterI(); friend class IceInternal::ObjectAdapterFactory; - ObjectPrx newProxy(const Identity&) const; - ObjectPrx newDirectProxy(const Identity&) const; + ObjectPrx newProxy(const Identity&, const std::string&) const; + ObjectPrx newDirectProxy(const Identity&, const std::string&) const; void checkForDeactivation() const; static void checkIdentity(const Identity&); std::vector<IceInternal::EndpointPtr> parseEndpoints(const std::string&) const; |