diff options
Diffstat (limited to 'cpp/src/Glacier2/ClientBlobject.cpp')
-rw-r--r-- | cpp/src/Glacier2/ClientBlobject.cpp | 138 |
1 files changed, 69 insertions, 69 deletions
diff --git a/cpp/src/Glacier2/ClientBlobject.cpp b/cpp/src/Glacier2/ClientBlobject.cpp index fde2b1669d0..a1e32dca027 100644 --- a/cpp/src/Glacier2/ClientBlobject.cpp +++ b/cpp/src/Glacier2/ClientBlobject.cpp @@ -17,9 +17,9 @@ using namespace Ice; using namespace Glacier2; Glacier2::ClientBlobject::ClientBlobject(const CommunicatorPtr& communicator, - const FilterManagerPtr& filters, - const Ice::Context& sslContext): - + const FilterManagerPtr& filters, + const Ice::Context& sslContext): + Glacier2::Blobject(communicator, false, sslContext), _routingTable(new RoutingTable(communicator)), _filters(filters), @@ -33,8 +33,8 @@ Glacier2::ClientBlobject::~ClientBlobject() void Glacier2::ClientBlobject::ice_invoke_async(const Ice::AMD_Array_Object_ice_invokePtr& amdCB, - const std::pair<const Byte*, const Byte*>& inParams, - const Current& current) + const std::pair<const Byte*, const Byte*>& inParams, + const Current& current) { bool matched = false; bool hasFilters = false; @@ -42,89 +42,89 @@ Glacier2::ClientBlobject::ice_invoke_async(const Ice::AMD_Array_Object_ice_invok if(!_filters->categories()->empty()) { - hasFilters = true; - if(_filters->categories()->match(current.id.category)) - { - matched = true; - } - else if(_rejectTraceLevel >= 1) - { - if(rejectedFilters.size() != 0) - { - rejectedFilters += ", "; - - } - rejectedFilters += "category filter"; - } + hasFilters = true; + if(_filters->categories()->match(current.id.category)) + { + matched = true; + } + else if(_rejectTraceLevel >= 1) + { + if(rejectedFilters.size() != 0) + { + rejectedFilters += ", "; + + } + rejectedFilters += "category filter"; + } } if(!_filters->identities()->empty()) { - hasFilters = true; - if(_filters->identities()->match(current.id)) - { - matched = true; - } - else if(_rejectTraceLevel >= 1) - { - if(rejectedFilters.size() != 0) - { - rejectedFilters += ", "; - - } - rejectedFilters += "identity filter"; - } + hasFilters = true; + if(_filters->identities()->match(current.id)) + { + matched = true; + } + else if(_rejectTraceLevel >= 1) + { + if(rejectedFilters.size() != 0) + { + rejectedFilters += ", "; + + } + rejectedFilters += "identity filter"; + } } ObjectPrx proxy = _routingTable->get(current.id); if(!proxy) { - ObjectNotExistException ex(__FILE__, __LINE__); - - // - // We use a special operation name indicate to the client that - // the proxy for the Ice object has not been found in our - // routing table. This can happen if the proxy was evicted - // from the routing table. - // - ex.id = current.id; - ex.facet = current.facet; - ex.operation = "ice_add_proxy"; - throw ex; + ObjectNotExistException ex(__FILE__, __LINE__); + + // + // We use a special operation name indicate to the client that + // the proxy for the Ice object has not been found in our + // routing table. This can happen if the proxy was evicted + // from the routing table. + // + ex.id = current.id; + ex.facet = current.facet; + ex.operation = "ice_add_proxy"; + throw ex; } string adapterId = proxy->ice_getAdapterId(); if(!adapterId.empty() && !_filters->adapterIds()->empty()) { - hasFilters = true; - if(_filters->adapterIds()->match(adapterId)) - { - matched = true; - } - else if(_rejectTraceLevel >= 1) - { - if(rejectedFilters.size() != 0) - { - rejectedFilters += ", "; - - } - rejectedFilters += "adapter id filter"; - } + hasFilters = true; + if(_filters->adapterIds()->match(adapterId)) + { + matched = true; + } + else if(_rejectTraceLevel >= 1) + { + if(rejectedFilters.size() != 0) + { + rejectedFilters += ", "; + + } + rejectedFilters += "adapter id filter"; + } } if(hasFilters && !matched) { - if(_rejectTraceLevel >= 1) - { - Trace out(_logger, "Glacier2"); - out << "rejecting request: " << rejectedFilters << "\n"; - out << "identity: " << _communicator->identityToString(current.id); - } - - ObjectNotExistException ex(__FILE__, __LINE__); - ex.id = current.id; - throw ex; + if(_rejectTraceLevel >= 1) + { + Trace out(_logger, "Glacier2"); + out << "rejecting request: " << rejectedFilters << "\n"; + out << "identity: " << _communicator->identityToString(current.id); + } + + ObjectNotExistException ex(__FILE__, __LINE__); + ex.id = current.id; + throw ex; } invoke(proxy, amdCB, inParams, current); } |