diff options
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/Ice/ConnectionI.cpp | 4 | ||||
| -rw-r--r-- | cpp/src/Ice/ObjectAdapterI.cpp | 5 | ||||
| -rw-r--r-- | cpp/src/Ice/Reference.cpp | 6 |
3 files changed, 7 insertions, 8 deletions
diff --git a/cpp/src/Ice/ConnectionI.cpp b/cpp/src/Ice/ConnectionI.cpp index 84156e8662a..2a393793093 100644 --- a/cpp/src/Ice/ConnectionI.cpp +++ b/cpp/src/Ice/ConnectionI.cpp @@ -447,9 +447,7 @@ Ice::ConnectionI::waitUntilFinished() _thread = 0; // - // Clear the OA. See - // http://bugzilla.zeroc.com/bugzilla/show_bug.cgi?id=1673 for - // the details of why this is necessary. + // Clear the OA. See bug 1673 for the details of why this is necessary. // _adapter = 0; } diff --git a/cpp/src/Ice/ObjectAdapterI.cpp b/cpp/src/Ice/ObjectAdapterI.cpp index 1ee53d618e5..feb6f4df9af 100644 --- a/cpp/src/Ice/ObjectAdapterI.cpp +++ b/cpp/src/Ice/ObjectAdapterI.cpp @@ -771,7 +771,7 @@ Ice::ObjectAdapterI::ObjectAdapterI(const InstancePtr& instance, const Communica if(oldProps.size() == 0 && props.size() == 0) { InitializationException ex(__FILE__, __LINE__); - ex.reason = "Object adapter \"" + _name + "\" requires configuration."; + ex.reason = "object adapter \"" + _name + "\" requires configuration."; throw ex; } } @@ -811,7 +811,8 @@ Ice::ObjectAdapterI::ObjectAdapterI(const InstancePtr& instance, const Communica if(_threadPerConnection && (threadPoolSize > 0 || threadPoolSizeMax > 0)) { InitializationException ex(__FILE__, __LINE__); - ex.reason = "adapter cannot be configured for both thread pool and thread per connection"; + ex.reason = "object adapter \"" + _name + "\" cannot be configured for both\n" + "thread pool and thread per connection"; throw ex; } diff --git a/cpp/src/Ice/Reference.cpp b/cpp/src/Ice/Reference.cpp index 2bd51e2da2d..2367353a48c 100644 --- a/cpp/src/Ice/Reference.cpp +++ b/cpp/src/Ice/Reference.cpp @@ -914,14 +914,14 @@ IceInternal::RoutableReference::changeEndpointSelection(EndpointSelectionType ne } ReferencePtr -IceInternal::RoutableReference::changeThreadPerConnection(bool newValue) const +IceInternal::RoutableReference::changeThreadPerConnection(bool newTpc) const { - if(newValue == _threadPerConnection) + if(newTpc == _threadPerConnection) { return RoutableReferencePtr(const_cast<RoutableReference*>(this)); } RoutableReferencePtr r = RoutableReferencePtr::dynamicCast(getInstance()->referenceFactory()->copy(this)); - r->_threadPerConnection = newValue; + r->_threadPerConnection = newTpc; return r; } |