diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2009-12-03 21:14:59 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2009-12-03 21:14:59 +0100 |
| commit | c5b5f38299c69bd68febb52b3559c4e653f54acb (patch) | |
| tree | 76f0dffec24a8f4fff91c90f1f51299d3de68723 /java/src/Ice/ObjectPrxHelperBase.java | |
| parent | Bug 4407 - Fixed C++Builder test failure (diff) | |
| download | ice-c5b5f38299c69bd68febb52b3559c4e653f54acb.tar.bz2 ice-c5b5f38299c69bd68febb52b3559c4e653f54acb.tar.xz ice-c5b5f38299c69bd68febb52b3559c4e653f54acb.zip | |
AMI requests now throw IllegalArgumentExcption instaed of TwowayOnlyException
Diffstat (limited to 'java/src/Ice/ObjectPrxHelperBase.java')
| -rw-r--r-- | java/src/Ice/ObjectPrxHelperBase.java | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/java/src/Ice/ObjectPrxHelperBase.java b/java/src/Ice/ObjectPrxHelperBase.java index 891fe6653e4..69baa8c3806 100644 --- a/java/src/Ice/ObjectPrxHelperBase.java +++ b/java/src/Ice/ObjectPrxHelperBase.java @@ -205,9 +205,9 @@ public class ObjectPrxHelperBase implements ObjectPrx, java.io.Serializable IceInternal.CallbackBase __cb) { IceInternal.OutgoingAsync __result = new IceInternal.OutgoingAsync(this, __ice_isA_name, __cb); + __checkAsyncTwowayOnly(__ice_isA_name); try { - __checkTwowayOnly(__ice_isA_name); __result.__prepare(__ice_isA_name, OperationMode.Nonmutating, __context, __explicitCtx); IceInternal.BasicStream __os = __result.__os(); __os.writeString(__id); @@ -536,9 +536,9 @@ public class ObjectPrxHelperBase implements ObjectPrx, java.io.Serializable begin_ice_ids(java.util.Map<String, String> __context, boolean __explicitCtx, IceInternal.CallbackBase __cb) { IceInternal.OutgoingAsync __result = new IceInternal.OutgoingAsync(this, __ice_ids_name, __cb); + __checkAsyncTwowayOnly(__ice_ids_name); try { - __checkTwowayOnly(__ice_ids_name); __result.__prepare(__ice_ids_name, OperationMode.Nonmutating, __context, __explicitCtx); IceInternal.BasicStream __os = __result.__os(); __os.endWriteEncaps(); @@ -712,9 +712,9 @@ public class ObjectPrxHelperBase implements ObjectPrx, java.io.Serializable begin_ice_id(java.util.Map<String, String> __context, boolean __explicitCtx, IceInternal.CallbackBase __cb) { IceInternal.OutgoingAsync __result = new IceInternal.OutgoingAsync(this, __ice_id_name, __cb); + __checkAsyncTwowayOnly(__ice_id_name); try { - __checkTwowayOnly(__ice_id_name); __result.__prepare(__ice_id_name, OperationMode.Nonmutating, __context, __explicitCtx); IceInternal.BasicStream __os = __result.__os(); __os.endWriteEncaps(); @@ -2032,6 +2032,20 @@ public class ObjectPrxHelperBase implements ObjectPrx, java.io.Serializable } } + public final void + __checkAsyncTwowayOnly(String name) + { + // + // No mutex lock necessary, there is nothing mutable in this + // operation. + // + + if(!ice_isTwoway()) + { + throw new java.lang.IllegalArgumentException("`" + name + "' can only be called with a twoway proxy"); + } + } + public final _ObjectDel __getDelegate(boolean ami) { |