diff options
Diffstat (limited to 'cpp/src/Ice/ConnectionI.cpp')
| -rw-r--r-- | cpp/src/Ice/ConnectionI.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cpp/src/Ice/ConnectionI.cpp b/cpp/src/Ice/ConnectionI.cpp index f9baff297ef..7082d4aed1e 100644 --- a/cpp/src/Ice/ConnectionI.cpp +++ b/cpp/src/Ice/ConnectionI.cpp @@ -1145,8 +1145,8 @@ Ice::ConnectionI::setAdapter(const ObjectAdapterPtr& adapter) // dispatch count with any old adapter is zero. // // A deadlock can occur if we wait while an operation is - // outstanding on this adapter that holds a lock while - // calling this function (e.g., __getDelegate). + // outstanding on this adapter that holds a lock while calling + // this function (e.g., __getDelegate). // // In order to avoid such a deadlock, we only wait if the new // adapter is different than the current one. @@ -1161,10 +1161,10 @@ Ice::ConnectionI::setAdapter(const ObjectAdapterPtr& adapter) } // - // We never change the thread pool with which we were initially - // registered, even if we add or remove an object adapter. + // We never change the thread pool with which we were + // initially registered, even if we add or remove an object + // adapter. // - _adapter = adapter; if(_adapter) { |