diff options
| -rw-r--r-- | cs/src/Ice/Proxy.cs | 32 | ||||
| -rw-r--r-- | java/src/Ice/ObjectPrx.java | 24 | ||||
| -rw-r--r-- | java/src/Ice/ObjectPrxHelperBase.java | 18 |
3 files changed, 30 insertions, 44 deletions
diff --git a/cs/src/Ice/Proxy.cs b/cs/src/Ice/Proxy.cs index e4dca24e911..fbb1b19f312 100644 --- a/cs/src/Ice/Proxy.cs +++ b/cs/src/Ice/Proxy.cs @@ -133,11 +133,9 @@ namespace Ice /// <param name="operation">The name of the operation to invoke.</param> /// <param name="mode">The operation mode (normal or idempotent).</param> /// <param name="inParams">The encoded in-parameters for the operation.</param> - /// <returns> If the operation completed successfully, the return value - /// is true. If the operation raises a user exception, - /// the return value is false; in this case, outParams - /// contains the encoded user exception. If the operation raises a run-time exception, - /// it throws it directly.</returns> + /// <returns> If the operation was invoked synchronously (because there + /// was no need to queue the request), the return value is true; + /// otherwise, if the invocation was queued, the return value is false.</returns> bool ice_invoke_async(AMI_Object_ice_invoke cb, string operation, OperationMode mode, byte[] inParams); /// <summary> @@ -148,11 +146,9 @@ namespace Ice /// <param name="mode">The operation mode (normal or idempotent).</param> /// <param name="inParams">The encoded in-parameters for the operation.</param> /// <param name="context">The context dictionary for the invocation.</param> - /// <returns> If the operation completed successfully, the return value - /// is true. If the operation raises a user exception, - /// the return value is false; in this case, outParams - /// contains the encoded user exception. If the operation raises a run-time exception, - /// it throws it directly.</returns> + /// <returns> If the operation was invoked synchronously (because there + /// was no need to queue the request), the return value is true; + /// otherwise, if the invocation was queued, the return value is false.</returns> bool ice_invoke_async(AMI_Object_ice_invoke cb, string operation, OperationMode mode, byte[] inParams, Dictionary<string, string> context); @@ -774,11 +770,9 @@ namespace Ice /// <param name="operation">The name of the operation to invoke.</param> /// <param name="mode">The operation mode (normal or idempotent).</param> /// <param name="inParams">The encoded in-parameters for the operation.</param> - /// <returns> If the operation completed successfully, the return value - /// is true. If the operation raises a user exception, - /// the return value is false; in this case, outParams - /// contains the encoded user exception. If the operation raises a run-time exception, - /// it throws it directly.</returns> + /// <returns> If the operation was invoked synchronously (because there + /// was no need to queue the request), the return value is true; + /// otherwise, if the invocation was queued, the return value is false.</returns> public bool ice_invoke_async(AMI_Object_ice_invoke cb, string operation, OperationMode mode, byte[] inParams) { checkTwowayOnly__("ice_invoke_async"); @@ -793,11 +787,9 @@ namespace Ice /// <param name="mode">The operation mode (normal or idempotent).</param> /// <param name="inParams">The encoded in-parameters for the operation.</param> /// <param name="context">The context dictionary for the invocation.</param> - /// <returns> If the operation completed successfully, the return value - /// is true. If the operation raises a user exception, - /// the return value is false; in this case, outParams - /// contains the encoded user exception. If the operation raises a run-time exception, - /// it throws it directly.</returns> + /// <returns> If the operation was invoked synchronously (because there + /// was no need to queue the request), the return value is true; + /// otherwise, if the invocation was queued, the return value is false.</returns> public bool ice_invoke_async(AMI_Object_ice_invoke cb, string operation, OperationMode mode, byte[] inParams, Dictionary<string, string> context) { diff --git a/java/src/Ice/ObjectPrx.java b/java/src/Ice/ObjectPrx.java index d1d4de3fb8f..e9cfa74be2f 100644 --- a/java/src/Ice/ObjectPrx.java +++ b/java/src/Ice/ObjectPrx.java @@ -127,9 +127,11 @@ public interface ObjectPrx * @param outParams The encoded out-paramaters and return value * for the operation. The return value follows any out-parameters. * @param __context The context map for the invocation. - * @return If the operation was invoked synchronously (because there - * was no need to queue the request, the return value is <code>true</code>; - * otherwise, if the invocation was queued, the return value is <code>false</code>. + * @return If the operation completed successfully, the return value + * is <code>true</code>. If the operation raises a user exception, + * the return value is <code>false</code>; in this case, <code>outParams</code> + * contains the encoded user exception. If the operation raises a run-time exception, + * it throws it directly. * * @see Blobject * @see OperationMode @@ -144,11 +146,9 @@ public interface ObjectPrx * @param operation The name of the operation to invoke. * @param mode The operation mode (normal or idempotent). * @param inParams The encoded in-parameters for the operation. - * @return If the operation completed successfully, the return value - * is <code>true</code>. If the operation raises a user exception, - * the return value is <code>false</code>; in this case, <code>outParams</code> - * contains the encoded user exception. If the operation raises a run-time exception, - * it throws it directly. + * @return If the operation was invoked synchronously (because there + * was no need to queue the request), the return value is <code>true</code>; + * otherwise, if the invocation was queued, the return value is <code>false</code>. * * @see AMI_Object_ice_invoke * @see OperationMode @@ -163,11 +163,9 @@ public interface ObjectPrx * @param mode The operation mode (normal or idempotent). * @param inParams The encoded in-parameters for the operation. * @param context The context map for the invocation. - * @return If the operation completed successfully, the return value - * is <code>true</code>. If the operation raises a user exception, - * the return value is <code>false</code>; in this case, <code>outParams</code> - * contains the encoded user exception. If the operation raises a run-time exception, - * it throws it directly. + * @return If the operation was invoked synchronously (because there + * was no need to queue the request), the return value is <code>true</code>; + * otherwise, if the invocation was queued, the return value is <code>false</code>. * * @see AMI_Object_ice_invoke * @see OperationMode diff --git a/java/src/Ice/ObjectPrxHelperBase.java b/java/src/Ice/ObjectPrxHelperBase.java index 63a8f606801..b7c01ab8553 100644 --- a/java/src/Ice/ObjectPrxHelperBase.java +++ b/java/src/Ice/ObjectPrxHelperBase.java @@ -306,7 +306,7 @@ public class ObjectPrxHelperBase implements ObjectPrx, java.io.Serializable * for the operation. The return value follows any out-parameters. * @param __context The context map for the invocation. * @return If the operation was invoked synchronously (because there - * was no need to queue the request, the return value is <code>true</code>; + * was no need to queue the request), the return value is <code>true</code>; * otherwise, if the invocation was queued, the return value is <code>false</code>. * * @see Blobject @@ -362,11 +362,9 @@ public class ObjectPrxHelperBase implements ObjectPrx, java.io.Serializable * @param operation The name of the operation to invoke. * @param mode The operation mode (normal or idempotent). * @param inParams The encoded in-parameters for the operation. - * @return If the operation completed successfully, the return value - * is <code>true</code>. If the operation raises a user exception, - * the return value is <code>false</code>; in this case, <code>outParams</code> - * contains the encoded user exception. If the operation raised an - * it throws it directly. + * @return If the operation was invoked synchronously (because there + * was no need to queue the request), the return value is <code>true</code>; + * otherwise, if the invocation was queued, the return value is <code>false</code>. * * @see AMI_Object_ice_invoke * @see OperationMode @@ -386,11 +384,9 @@ public class ObjectPrxHelperBase implements ObjectPrx, java.io.Serializable * @param mode The operation mode (normal or idempotent). * @param inParams The encoded in-parameters for the operation. * @param __context The context map for the invocation. - * @return If the operation completed successfully, the return value - * is <code>true</code>. If the operation raises a user exception, - * the return value is <code>false</code>; in this case, <code>outParams</code> - * contains the encoded user exception. If the operation raised an - * it throws it directly. + * @return If the operation was invoked synchronously (because there + * was no need to queue the request), the return value is <code>true</code>; + * otherwise, if the invocation was queued, the return value is <code>false</code>. * * @see AMI_Object_ice_invoke * @see OperationMode |