diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2009-10-14 16:43:16 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2009-10-14 16:43:16 +0200 |
| commit | 578eb177a948360e4ad692996ddb1608d8728d94 (patch) | |
| tree | 73f3d325ccc4572727c2637dceb45b316265c77d /cpp/src/Glacier2/Blobject.cpp | |
| parent | Fixed Windows build issues (diff) | |
| download | ice-578eb177a948360e4ad692996ddb1608d8728d94.tar.bz2 ice-578eb177a948360e4ad692996ddb1608d8728d94.tar.xz ice-578eb177a948360e4ad692996ddb1608d8728d94.zip | |
Fixed bug 4228 - add connection information to context
Diffstat (limited to 'cpp/src/Glacier2/Blobject.cpp')
| -rw-r--r-- | cpp/src/Glacier2/Blobject.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/cpp/src/Glacier2/Blobject.cpp b/cpp/src/Glacier2/Blobject.cpp index a7473a64251..efc168ead11 100644 --- a/cpp/src/Glacier2/Blobject.cpp +++ b/cpp/src/Glacier2/Blobject.cpp @@ -137,7 +137,7 @@ private: } Glacier2::Blobject::Blobject(const InstancePtr& instance, const ConnectionPtr& reverseConnection, - const Ice::Context& sslContext) : + const Ice::Context& context) : _instance(instance), _reverseConnection(reverseConnection), _forwardContext(_reverseConnection ? @@ -152,7 +152,7 @@ Glacier2::Blobject::Blobject(const InstancePtr& instance, const ConnectionPtr& r _overrideTraceLevel(reverseConnection ? _instance->properties()->getPropertyAsInt(serverTraceOverride) : _instance->properties()->getPropertyAsInt(clientTraceOverride)), - _sslContext(sslContext) + _context(context) { RequestQueueThreadPtr t = _reverseConnection ? _instance->serverRequestQueueThread() : _instance->clientRequestQueueThread(); @@ -337,7 +337,7 @@ Glacier2::Blobject::invoke(ObjectPrx& proxy, const AMD_Object_ice_invokePtr& amd bool override; try { - override = _requestQueue->addRequest(new Request(proxy, inParams, current, _forwardContext, _sslContext, + override = _requestQueue->addRequest(new Request(proxy, inParams, current, _forwardContext, _context, amdCB)); } catch(const ObjectNotExistException& ex) @@ -402,11 +402,11 @@ Glacier2::Blobject::invoke(ObjectPrx& proxy, const AMD_Object_ice_invokePtr& amd bool sent; if(_forwardContext) { - if(_sslContext.size() > 0) + if(_context.size() > 0) { Ice::Context ctx = current.ctx; - ctx.insert(_sslContext.begin(), _sslContext.end()); - sent = proxy->ice_invoke_async(amiCB, current.operation, current.mode, inParams); + ctx.insert(_context.begin(), _context.end()); + sent = proxy->ice_invoke_async(amiCB, current.operation, current.mode, inParams, ctx); } else { @@ -415,9 +415,9 @@ Glacier2::Blobject::invoke(ObjectPrx& proxy, const AMD_Object_ice_invokePtr& amd } else { - if(_sslContext.size() > 0) + if(_context.size() > 0) { - sent = proxy->ice_invoke_async(amiCB, current.operation, current.mode, inParams, _sslContext); + sent = proxy->ice_invoke_async(amiCB, current.operation, current.mode, inParams, _context); } else { |