diff options
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/config/TestUtil.py | 4 | ||||
| -rw-r--r-- | cpp/src/Ice/OutgoingAsync.cpp | 10 | ||||
| -rw-r--r-- | cpp/src/Ice/Reference.cpp | 30 |
3 files changed, 22 insertions, 22 deletions
diff --git a/cpp/config/TestUtil.py b/cpp/config/TestUtil.py index b6a7e073eac..a10699706e6 100644 --- a/cpp/config/TestUtil.py +++ b/cpp/config/TestUtil.py @@ -13,8 +13,8 @@ # protocol. Otherwise TCP is used. # -protocol = "ssl" -#protocol = "tcp" +#protocol = "ssl" +protocol = "tcp" # # Set compressed to 1 in case you want to run the tests with diff --git a/cpp/src/Ice/OutgoingAsync.cpp b/cpp/src/Ice/OutgoingAsync.cpp index 7cee43b5d37..ad1e8e6436e 100644 --- a/cpp/src/Ice/OutgoingAsync.cpp +++ b/cpp/src/Ice/OutgoingAsync.cpp @@ -203,7 +203,7 @@ IceInternal::OutgoingAsync::__finished(const LocalException& exc) { IceUtil::Monitor<IceUtil::RecMutex>::Lock sync(_monitor); - if(__is) // Don't retry if cleanup has been called. + if(__os) // Don't retry if cleanup() was already called. { bool doRetry = false; @@ -280,7 +280,7 @@ IceInternal::OutgoingAsync::__prepare(const ObjectPrx& prx, const string& operat // // We must first wait for other requests to finish. // - while(__is) + while(__os) { _monitor.wait(); } @@ -415,7 +415,7 @@ IceInternal::OutgoingAsync::__send() void IceInternal::OutgoingAsync::warning(const Exception& ex) const { - if(__is) // Don't print anything if cleanup() was already called. + if(__os) // Don't print anything if cleanup() was already called. { if(_reference->getInstance()->properties()->getPropertyAsIntWithDefault("Ice.Warn.AMICallback", 1) > 0) { @@ -428,7 +428,7 @@ IceInternal::OutgoingAsync::warning(const Exception& ex) const void IceInternal::OutgoingAsync::warning(const std::exception& ex) const { - if(__is) // Don't print anything if cleanup() was already called. + if(__os) // Don't print anything if cleanup() was already called. { if(_reference->getInstance()->properties()->getPropertyAsIntWithDefault("Ice.Warn.AMICallback", 1) > 0) { @@ -441,7 +441,7 @@ IceInternal::OutgoingAsync::warning(const std::exception& ex) const void IceInternal::OutgoingAsync::warning() const { - if(__is) // Don't print anything if cleanup() was already called. + if(__os) // Don't print anything if cleanup() was already called. { if(_reference->getInstance()->properties()->getPropertyAsIntWithDefault("Ice.Warn.AMICallback", 1) > 0) { diff --git a/cpp/src/Ice/Reference.cpp b/cpp/src/Ice/Reference.cpp index 1d0d1d410af..8418c2f45a4 100644 --- a/cpp/src/Ice/Reference.cpp +++ b/cpp/src/Ice/Reference.cpp @@ -896,21 +896,21 @@ IceInternal::RoutableReference::createConnection(const vector<EndpointIPtr>& all // switch(getEndpointSelection()) { - case Random: - { - random_shuffle(endpoints.begin(), endpoints.end()); - break; - } - case Ordered: - { - // Nothing to do. - break; - } - default: - { - assert(false); - break; - } + case Random: + { + random_shuffle(endpoints.begin(), endpoints.end()); + break; + } + case Ordered: + { + // Nothing to do. + break; + } + default: + { + assert(false); + break; + } } // |