summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernard Normier <bernard@zeroc.com>2012-08-17 09:34:57 -0400
committerBernard Normier <bernard@zeroc.com>2012-08-17 09:34:57 -0400
commitdb4cc63ce6a1687da905c1ca04d61c0f1574e36c (patch)
tree95a9e087d9726e5b46d40b50a10f8f8a8c10eb66
parent Updated GCC stack trace printing to look like Windows stack trace printing (diff)
downloadice-db4cc63ce6a1687da905c1ca04d61c0f1574e36c.tar.bz2
ice-db4cc63ce6a1687da905c1ca04d61c0f1574e36c.tar.xz
ice-db4cc63ce6a1687da905c1ca04d61c0f1574e36c.zip
Fixed bug #ICE-4844
-rw-r--r--slice/Ice/Communicator.ice8
1 files changed, 4 insertions, 4 deletions
diff --git a/slice/Ice/Communicator.ice b/slice/Ice/Communicator.ice
index 3a90ca492cf..6ab1b9fe2a2 100644
--- a/slice/Ice/Communicator.ice
+++ b/slice/Ice/Communicator.ice
@@ -280,8 +280,8 @@ local interface Communicator
/**
*
- * <p>Add a servant factory to this communicator. Installing a
- * factory with an id for which a factory is already registered
+ * <p>Add an object factory to this communicator. Installing a
+ * factory with an id for which a factory is already registered
* throws {@link AlreadyRegisteredException}.</p>
*
* <p>When unmarshaling an Ice object, the Ice run-time reads the
@@ -323,12 +323,12 @@ local interface Communicator
/**
*
- * Find a servant factory registered with this communicator.
+ * Find an object factory registered with this communicator.
*
* @param id The type id for which the factory can create instances,
* or an empty string for the default factory.
*
- * @return The servant factory, or null if no servant factory was
+ * @return The object factory, or null if no object factory was
* found for the given id.
*
* @see #addObjectFactory