summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Spruiell <mes@zeroc.com>2009-01-09 14:31:31 -0800
committerMark Spruiell <mes@zeroc.com>2009-01-09 14:31:31 -0800
commitab9494173cb63b566f28a2810f701c4554f3085d (patch)
tree77f82c9de020ca8e63e3ecd2082763624b3c1d07
parenthttp://bugzilla.zeroc.com/bugzilla/show_bug.cgi?id=3627 fix ant clean rules. (diff)
downloadice-ab9494173cb63b566f28a2810f701c4554f3085d.tar.bz2
ice-ab9494173cb63b566f28a2810f701c4554f3085d.tar.xz
ice-ab9494173cb63b566f28a2810f701c4554f3085d.zip
bug 3526 - adding Slice comment about recreating OA
-rw-r--r--slice/Ice/ObjectAdapter.ice12
1 files changed, 7 insertions, 5 deletions
diff --git a/slice/Ice/ObjectAdapter.ice b/slice/Ice/ObjectAdapter.ice
index 2be7351178e..264aa046784 100644
--- a/slice/Ice/ObjectAdapter.ice
+++ b/slice/Ice/ObjectAdapter.ice
@@ -105,7 +105,9 @@ local interface ObjectAdapter
* otherwise. Attempts to use a deactivated object adapter raise
* [ObjectAdapterDeactivatedException]; however, attempts to
* [deactivate] an already deactivated object adapter are ignored
- * and do nothing.
+ * and do nothing. Once deactivated, it is possible to destroy the
+ * adapter to clean up resources and then create and activate a
+ * new adapter with the same name.
*
* <p class="Note"> After [deactivate] returns, no new requests are
* processed by the object adapter. However, requests that have
@@ -150,11 +152,11 @@ local interface ObjectAdapter
/**
*
* Destroys the object adapter and cleans up all resources
- * held by the object adapter. If object adapter has not yet
+ * held by the object adapter. If the object adapter has not yet
* been deactivated, [destroy] implicitly initiates the
- * deactivation and waits for it to finish. Once [destroy] has
- * returned it is possible to recreate an object adapter with
- * the same name. Subsequent calls to [destroy] are ignored.
+ * deactivation and waits for it to finish. Subsequent calls to
+ * [destroy] are ignored. Once [destroy] has returned, it is
+ * possible to create another object adapter with the same name.
*
* @see deactivate
* @see waitForDeactivate