diff options
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/slice/Ice/Communicator.ice | 5 | ||||
| -rw-r--r-- | cpp/slice/Ice/ObjectAdapter.ice | 11 |
2 files changed, 8 insertions, 8 deletions
diff --git a/cpp/slice/Ice/Communicator.ice b/cpp/slice/Ice/Communicator.ice index 56d3cdb931d..58875b73995 100644 --- a/cpp/slice/Ice/Communicator.ice +++ b/cpp/slice/Ice/Communicator.ice @@ -68,8 +68,9 @@ local interface Communicator /** * * Shuts down this communicator's server functionality, including - * the deactivation of all object adapters. Subsequent calls to - * [shutdown] are ignored. + * the deactivation of all object adapters. (Attempts to use + * a deactivated object adapter raise [ObjectAdapterDeactivatedException].) + * Subsequent calls to [shutdown] are ignored. * * <note><para> After [shutdown] returns, no new requests are * processed. However, requests that have been started before diff --git a/cpp/slice/Ice/ObjectAdapter.ice b/cpp/slice/Ice/ObjectAdapter.ice index 13503234baf..5b79b7676eb 100644 --- a/cpp/slice/Ice/ObjectAdapter.ice +++ b/cpp/slice/Ice/ObjectAdapter.ice @@ -101,12 +101,11 @@ local interface ObjectAdapter * Deactivate all endpoints that belong to this object * adapter. After deactivation, the object adapter stops receiving * requests through its endpoints. Object adapters that have been - * deactivated must not be reactivated again, i.e., the - * deactivation is permanent and [activate] or [hold] must not be - * called after calling [deactivate]; attempting to do so results - * in an [ObjectAdapterDeactivatedException] being thrown. Calls - * to [deactivate] on an already deactivated object adapter are - * ignored. + * deactivated must not be reactivated again, and cannot be used + * otherwise. Attempts to use a deactivated object adapter raise + * [ObjectAdapterDeactivatedException]; however, attempts to + * [deactivate] an already deactivated object adapter are ignored + * and do nothing. * * <note><para> After [deactivate] returns, no new requests are * processed by the object adapter. However, requests that have |