summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/IceGrid/Database.cpp2
-rw-r--r--cpp/src/IceGrid/LocatorI.cpp142
2 files changed, 72 insertions, 72 deletions
diff --git a/cpp/src/IceGrid/Database.cpp b/cpp/src/IceGrid/Database.cpp
index 8782672ac31..f1534ef548f 100644
--- a/cpp/src/IceGrid/Database.cpp
+++ b/cpp/src/IceGrid/Database.cpp
@@ -1076,7 +1076,7 @@ Database::getAdapterDirectProxy(const string& id, const Ice::EncodingVersion& en
filterAdapterInfos("", id, _pluginFacade, con, ctx, infos);
for(unsigned int i = 0; i < infos.size(); ++i)
{
- if(infos[i].proxy->ice_getEncodingVersion() < encoding)
+ if(IceInternal::isSupported(encoding, infos[i].proxy->ice_getEncodingVersion()))
{
Ice::EndpointSeq edpts = infos[i].proxy->ice_getEndpoints();
endpoints.insert(endpoints.end(), edpts.begin(), edpts.end());
diff --git a/cpp/src/IceGrid/LocatorI.cpp b/cpp/src/IceGrid/LocatorI.cpp
index da547b23072..fbe2332b624 100644
--- a/cpp/src/IceGrid/LocatorI.cpp
+++ b/cpp/src/IceGrid/LocatorI.cpp
@@ -27,7 +27,7 @@ class AdapterGetDirectProxyCallback : virtual public IceUtil::Shared
{
public:
- AdapterGetDirectProxyCallback(const LocatorIPtr& locator, const LocatorAdapterInfo& adapter) :
+ AdapterGetDirectProxyCallback(const LocatorIPtr& locator, const LocatorAdapterInfo& adapter) :
_locator(locator), _adapter(adapter)
{
}
@@ -39,7 +39,7 @@ public:
}
virtual void exception(const ::Ice::Exception& e)
- {
+ {
_locator->getDirectProxyException(_adapter, e);
}
@@ -53,7 +53,7 @@ class AdapterActivateCallback : virtual public IceUtil::Shared
{
public:
- AdapterActivateCallback(const LocatorIPtr& locator, const LocatorAdapterInfo& adapter) :
+ AdapterActivateCallback(const LocatorIPtr& locator, const LocatorAdapterInfo& adapter) :
_locator(locator), _adapter(adapter)
{
}
@@ -82,7 +82,7 @@ class AMD_Locator_findAdapterByIdI : public Ice::AMD_Locator_findAdapterById
{
public:
- AMD_Locator_findAdapterByIdI(const Ice::AMD_Locator_findObjectByIdPtr& cb, const Ice::ObjectPrx& obj) :
+ AMD_Locator_findAdapterByIdI(const Ice::AMD_Locator_findObjectByIdPtr& cb, const Ice::ObjectPrx& obj) :
_cb(cb),
_obj(obj)
{
@@ -119,7 +119,7 @@ public:
//
// We couldn't find the adapter, we ignore and return the
// original proxy containing the adapter id.
- //
+ //
_cb->ice_response(_obj);
return;
}
@@ -131,7 +131,7 @@ public:
_cb->ice_exception(ex);
return;
}
-
+
assert(false);
}
@@ -146,7 +146,7 @@ public:
}
private:
-
+
const Ice::AMD_Locator_findObjectByIdPtr _cb;
const Ice::ObjectPrx _obj;
};
@@ -155,10 +155,10 @@ class AdapterRequest : public LocatorI::Request
{
public:
- AdapterRequest(const Ice::AMD_Locator_findAdapterByIdPtr& amdCB,
- const LocatorIPtr& locator,
+ AdapterRequest(const Ice::AMD_Locator_findAdapterByIdPtr& amdCB,
+ const LocatorIPtr& locator,
const Ice::EncodingVersion& encoding,
- const LocatorAdapterInfo& adapter) :
+ const LocatorAdapterInfo& adapter) :
_amdCB(amdCB),
_locator(locator),
_encoding(encoding),
@@ -180,7 +180,7 @@ public:
// Nothing to do.
}
- virtual void
+ virtual void
response(const std::string& id, const Ice::ObjectPrx& proxy)
{
assert(proxy);
@@ -190,10 +190,10 @@ public:
//
if(!IceInternal::isSupported(_encoding, proxy->ice_getEncodingVersion()))
{
- exception(id, Ice::UnsupportedEncodingException(__FILE__,
- __LINE__,
+ exception(id, Ice::UnsupportedEncodingException(__FILE__,
+ __LINE__,
"server doesn't support requested encoding",
- _encoding,
+ _encoding,
proxy->ice_getEncodingVersion()));
return;
}
@@ -201,7 +201,7 @@ public:
_amdCB->ice_response(proxy->ice_identity(_locator->getCommunicator()->stringToIdentity("dummy")));
}
- virtual void
+ virtual void
exception(const std::string&, const Ice::Exception& ex)
{
if(_traceLevels->locator > 0)
@@ -225,13 +225,13 @@ class ReplicaGroupRequest : public LocatorI::Request, public IceUtil::Mutex
{
public:
- ReplicaGroupRequest(const Ice::AMD_Locator_findAdapterByIdPtr& amdCB,
+ ReplicaGroupRequest(const Ice::AMD_Locator_findAdapterByIdPtr& amdCB,
const LocatorIPtr& locator,
const string& id,
const Ice::EncodingVersion& encoding,
const LocatorAdapterInfoSeq& adapters,
int count,
- Ice::ObjectPrx firstProxy) :
+ Ice::ObjectPrx firstProxy) :
_amdCB(amdCB),
_locator(locator),
_id(id),
@@ -290,8 +290,8 @@ public:
return;
}
}
-
-
+
+
for(LocatorAdapterInfoSeq::const_iterator p = adapters.begin(); p != adapters.end(); ++p)
{
if(_locator->getDirectProxy(*p, this))
@@ -305,7 +305,7 @@ public:
activating(const string&)
{
//
- // An adapter is being activated. Don't wait for the activation to complete. Instead,
+ // An adapter is being activated. Don't wait for the activation to complete. Instead,
// we query the next adapter which might be already active.
//
LocatorAdapterInfo adapter;
@@ -321,7 +321,7 @@ public:
}
while(_locator->getDirectProxy(adapter, this));
}
-
+
virtual void
exception(const string& /*id*/, const Ice::Exception& ex)
{
@@ -332,16 +332,16 @@ public:
{
return;
}
-
+
if(!_exception.get())
{
_exception.reset(ex.ice_clone());
}
-
+
if(_lastAdapter == _adapters.end())
{
--_count; // Expect one less adapter proxy if there's no more adapters to query.
-
+
//
// If we received all the required proxies, it's time to send the
// answer back to the client.
@@ -373,16 +373,16 @@ public:
//
// Ensure the server supports the request encoding.
//
- if(proxy->ice_getEncodingVersion() < _encoding)
+ if(!IceInternal::isSupported(_encoding, proxy->ice_getEncodingVersion()))
{
- exception(id, Ice::UnsupportedEncodingException(__FILE__,
- __LINE__,
+ exception(id, Ice::UnsupportedEncodingException(__FILE__,
+ __LINE__,
"server doesn't support requested encoding",
- _encoding,
+ _encoding,
proxy->ice_getEncodingVersion()));
return;
}
-
+
Lock sync(*this);
assert(proxy);
if(_proxies.size() == _count) // Nothing to do if we already sent the response.
@@ -391,7 +391,7 @@ public:
}
_proxies[id] = proxy->ice_identity(_locator->getCommunicator()->stringToIdentity("dummy"));
-
+
//
// If we received all the required proxies, it's time to send the
// answer back to the client.
@@ -414,7 +414,7 @@ private:
else if(_proxies.empty())
{
//
- // If there's no proxies, it's either because we couldn't contact the adapters or
+ // If there's no proxies, it's either because we couldn't contact the adapters or
// because the replica group has no members.
//
assert(_exception.get() || _adapters.empty());
@@ -461,7 +461,7 @@ class RoundRobinRequest : public LocatorI::Request, SynchronizationCallback, pub
{
public:
- RoundRobinRequest(const Ice::AMD_Locator_findAdapterByIdPtr& amdCB,
+ RoundRobinRequest(const Ice::AMD_Locator_findAdapterByIdPtr& amdCB,
const LocatorIPtr& locator,
const DatabasePtr database,
const string& id,
@@ -483,7 +483,7 @@ public:
assert(_adapters.empty() || _count > 0);
}
- virtual void
+ virtual void
execute()
{
if(_adapters.empty())
@@ -505,7 +505,7 @@ public:
}
}
- virtual void
+ virtual void
activating(const string& id)
{
LocatorAdapterInfo adapter;
@@ -523,18 +523,18 @@ public:
while(adapter.proxy && _locator->getDirectProxy(adapter, this));
}
- virtual void
+ virtual void
response(const std::string& id, const Ice::ObjectPrx& proxy)
{
//
// Ensure the server supports the request encoding.
//
- if(proxy->ice_getEncodingVersion() < _encoding)
+ if(!IceInternal::isSupported(_encoding, proxy->ice_getEncodingVersion()))
{
- exception(id, Ice::UnsupportedEncodingException(__FILE__,
- __LINE__,
+ exception(id, Ice::UnsupportedEncodingException(__FILE__,
+ __LINE__,
"server doesn't support requested encoding",
- _encoding,
+ _encoding,
proxy->ice_getEncodingVersion()));
return;
}
@@ -549,7 +549,7 @@ public:
if(_count > 1)
{
Ice::ObjectPrx p = proxy->ice_identity(_locator->getCommunicator()->stringToIdentity("dummy"));
- LocatorI::RequestPtr request =
+ LocatorI::RequestPtr request =
new ReplicaGroupRequest(_amdCB, _locator, _id, _encoding, _adapters, _count, p);
request->execute();
}
@@ -560,7 +560,7 @@ public:
_adapters.clear();
}
- virtual void
+ virtual void
exception(const std::string& id, const Ice::Exception& ex)
{
LocatorAdapterInfo adapter;
@@ -636,15 +636,15 @@ public:
}
private:
-
+
LocatorAdapterInfo
nextAdapter()
{
bool replicaGroup;
bool roundRobin;
-
+
_adapters.clear();
-
+
try
{
while(true)
@@ -653,17 +653,17 @@ private:
{
if(!_waitForActivation)
{
- _database->getLocatorAdapterInfo(_id, _connection, _context, _adapters, _count, replicaGroup,
+ _database->getLocatorAdapterInfo(_id, _connection, _context, _adapters, _count, replicaGroup,
roundRobin, _activatingOrFailed);
}
-
+
if(_waitForActivation || (_adapters.empty() && _activatingOrFailed.size() > _failed.size()))
{
//
- // If there are no more adapters to try and some servers were being activated, we
+ // If there are no more adapters to try and some servers were being activated, we
// try again but this time we wait for the server activation.
//
- _database->getLocatorAdapterInfo(_id, _connection, _context, _adapters, _count, replicaGroup,
+ _database->getLocatorAdapterInfo(_id, _connection, _context, _adapters, _count, replicaGroup,
roundRobin, _failed);
_waitForActivation = true;
}
@@ -677,7 +677,7 @@ private:
{
callback = _database->addAdapterSyncCallback(_id, this, _activatingOrFailed);
}
- else
+ else
{
callback = _database->addAdapterSyncCallback(_id, this, _failed);
}
@@ -694,7 +694,7 @@ private:
{
Ice::Current current;
current.encoding = _encoding;
- _locator->findAdapterById_async(_amdCB, _id, current);
+ _locator->findAdapterById_async(_amdCB, _id, current);
}
catch(const Ice::Exception& ex)
{
@@ -758,15 +758,15 @@ private:
class FindAdapterByIdCallback : public SynchronizationCallback
{
public:
-
- FindAdapterByIdCallback(const LocatorIPtr& locator,
- const Ice::AMD_Locator_findAdapterByIdPtr& cb,
+
+ FindAdapterByIdCallback(const LocatorIPtr& locator,
+ const Ice::AMD_Locator_findAdapterByIdPtr& cb,
const string& id,
const Ice::Current& current) : _locator(locator), _cb(cb), _id(id), _current(current)
{
}
- virtual void
+ virtual void
synchronized()
{
try
@@ -779,7 +779,7 @@ public:
}
}
- virtual void
+ virtual void
synchronized(const Ice::Exception& ex)
{
try
@@ -802,7 +802,7 @@ public:
}
private:
-
+
const LocatorIPtr _locator;
const Ice::AMD_Locator_findAdapterByIdPtr _cb;
const string _id;
@@ -812,14 +812,14 @@ private:
};
-LocatorI::LocatorI(const Ice::CommunicatorPtr& communicator,
- const DatabasePtr& database,
+LocatorI::LocatorI(const Ice::CommunicatorPtr& communicator,
+ const DatabasePtr& database,
const WellKnownObjectsManagerPtr& wellKnownObjects,
const RegistryPrx& registry,
const QueryPrx& query) :
- _communicator(communicator),
- _database(database),
- _wellKnownObjects(wellKnownObjects),
+ _communicator(communicator),
+ _database(database),
+ _wellKnownObjects(wellKnownObjects),
_localRegistry(registry),
_localQuery(query)
{
@@ -830,8 +830,8 @@ LocatorI::LocatorI(const Ice::CommunicatorPtr& communicator,
// registry.
//
void
-LocatorI::findObjectById_async(const Ice::AMD_Locator_findObjectByIdPtr& cb,
- const Ice::Identity& id,
+LocatorI::findObjectById_async(const Ice::AMD_Locator_findObjectByIdPtr& cb,
+ const Ice::Identity& id,
const Ice::Current&) const
{
try
@@ -849,8 +849,8 @@ LocatorI::findObjectById_async(const Ice::AMD_Locator_findObjectByIdPtr& cb,
// registry. If found, we try to get its direct proxy.
//
void
-LocatorI::findAdapterById_async(const Ice::AMD_Locator_findAdapterByIdPtr& cb,
- const string& id,
+LocatorI::findAdapterById_async(const Ice::AMD_Locator_findAdapterByIdPtr& cb,
+ const string& id,
const Ice::Current& current) const
{
LocatorIPtr self = const_cast<LocatorI*>(this);
@@ -859,7 +859,7 @@ LocatorI::findAdapterById_async(const Ice::AMD_Locator_findAdapterByIdPtr& cb,
{
//
// NOTE: getProxies() might throw if the adapter is a server
- // adapter and the node is unreachable (it doesn't throw for
+ // adapter and the node is unreachable (it doesn't throw for
// replica groups).
//
int count;
@@ -869,7 +869,7 @@ LocatorI::findAdapterById_async(const Ice::AMD_Locator_findAdapterByIdPtr& cb,
{
try
{
- _database->getLocatorAdapterInfo(id, current.con, current.ctx, adapters, count, replicaGroup,
+ _database->getLocatorAdapterInfo(id, current.con, current.ctx, adapters, count, replicaGroup,
roundRobin);
break;
}
@@ -972,14 +972,14 @@ LocatorI::getDirectProxy(const LocatorAdapterInfo& adapter, const RequestPtr& re
p->second.push_back(request);
return _activating.find(adapter.id) != _activating.end();
}
-
+
PendingRequests requests;
requests.push_back(request);
_pendingRequests.insert(make_pair(adapter.id, requests));
}
adapter.proxy->begin_getDirectProxy(newCallback_Adapter_getDirectProxy(
new AdapterGetDirectProxyCallback(this, adapter),
- &AdapterGetDirectProxyCallback::response,
+ &AdapterGetDirectProxyCallback::response,
&AdapterGetDirectProxyCallback::exception));
return false;
}
@@ -1028,7 +1028,7 @@ LocatorI::getDirectProxyException(const LocatorAdapterInfo& adapter, const Ice::
catch(const Ice::Exception&)
{
}
-
+
PendingRequests requests;
{
Lock sync(*this);
@@ -1057,7 +1057,7 @@ LocatorI::getDirectProxyException(const LocatorAdapterInfo& adapter, const Ice::
int timeout = adapter.activationTimeout + adapter.deactivationTimeout;
AdapterPrx::uncheckedCast(adapter.proxy->ice_invocationTimeout(timeout * 1000))->begin_activate(
newCallback_Adapter_activate(new AdapterActivateCallback(this, adapter),
- &AdapterActivateCallback::response,
+ &AdapterActivateCallback::response,
&AdapterActivateCallback::exception));
}
else
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-04 01:29:35 +0000