diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2014-06-27 10:31:41 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2014-06-27 10:31:41 +0200 |
| commit | a4f93259dc3494d98addf38e69b87eb557d432b3 (patch) | |
| tree | d2b78bb5cea24e33dc1b46be22dba6167e96c9ed /cpp/src/Ice/ProxyFactory.cpp | |
| parent | Fix for ICE-5515 (ice_staticId on proxies) in Java, C#, Python, Ruby and PHP ... (diff) | |
| download | ice-a4f93259dc3494d98addf38e69b87eb557d432b3.tar.bz2 ice-a4f93259dc3494d98addf38e69b87eb557d432b3.tar.xz ice-a4f93259dc3494d98addf38e69b87eb557d432b3.zip | |
Better collocation optimization, fix for ICE-5489, ICE-5484
Diffstat (limited to 'cpp/src/Ice/ProxyFactory.cpp')
| -rw-r--r-- | cpp/src/Ice/ProxyFactory.cpp | 23 |
1 files changed, 5 insertions, 18 deletions
diff --git a/cpp/src/Ice/ProxyFactory.cpp b/cpp/src/Ice/ProxyFactory.cpp index 325f9abe134..b38e281622a 100644 --- a/cpp/src/Ice/ProxyFactory.cpp +++ b/cpp/src/Ice/ProxyFactory.cpp @@ -110,18 +110,15 @@ IceInternal::ProxyFactory::referenceToProxy(const ReferencePtr& ref) const } int -IceInternal::ProxyFactory::checkRetryAfterException(const LocalException& ex, - const ReferencePtr& ref, - bool sleep, - int& cnt) const +IceInternal::ProxyFactory::checkRetryAfterException(const LocalException& ex, const ReferencePtr& ref, int& cnt) const { TraceLevelsPtr traceLevels = _instance->traceLevels(); LoggerPtr logger = _instance->initializationData().logger; // - // We don't retry batch requests because the exception might have caused - // the all the requests batched with the connection to be aborted and we - // want the application to be notified. + // We don't retry batch requests because the exception might have + // caused all the requests batched with the connection to be + // aborted and we want the application to be notified. // if(ref->getMode() == Reference::ModeBatchOneway || ref->getMode() == Reference::ModeBatchDatagram) { @@ -129,7 +126,6 @@ IceInternal::ProxyFactory::checkRetryAfterException(const LocalException& ex, } const ObjectNotExistException* one = dynamic_cast<const ObjectNotExistException*>(&ex); - if(one) { if(ref->getRouterInfo() && one->operation == "ice_add_proxy") @@ -226,8 +222,7 @@ IceInternal::ProxyFactory::checkRetryAfterException(const LocalException& ex, assert(cnt > 0); int interval = -1; - if(cnt == static_cast<int>(_retryIntervals.size() + 1) && - dynamic_cast<const CloseConnectionException*>(&ex)) + if(cnt == static_cast<int>(_retryIntervals.size() + 1) && dynamic_cast<const CloseConnectionException*>(&ex)) { // // A close connection exception is always retried at least once, even if the retry @@ -259,14 +254,6 @@ IceInternal::ProxyFactory::checkRetryAfterException(const LocalException& ex, } out << " because of exception\n" << ex; } - - if(sleep && interval > 0) - { - // - // Sleep before retrying. - // - IceUtil::ThreadControl::sleep(IceUtil::Time::milliSeconds(interval)); - } return interval; } |