diff options
| author | Michi Henning <michi@zeroc.com> | 2002-09-04 05:39:57 +0000 |
|---|---|---|
| committer | Michi Henning <michi@zeroc.com> | 2002-09-04 05:39:57 +0000 |
| commit | a5da64185ba234ae8dfdec11764e1821bbc67a57 (patch) | |
| tree | 4aa60640dbb0b01960e8aa644ef9179594e28b6d /java/src/Ice/ObjectPrxHelper.java | |
| parent | fix (diff) | |
| download | ice-a5da64185ba234ae8dfdec11764e1821bbc67a57.tar.bz2 ice-a5da64185ba234ae8dfdec11764e1821bbc67a57.tar.xz ice-a5da64185ba234ae8dfdec11764e1821bbc67a57.zip | |
Changed Current.ice to use enum OperationMode to distinguish between
Normal, Nonmutating, and Idempotent operations. Fixed bug introduced
into Freeze with previous changes for saving object state. (State
wasn't saved for idempotent operations.) Retested everything. I'm
getting a failure in the Yellow (C++) tests, and another failure in the
IceBox (Java) tests, but I don't think these are related to these
changes.
Diffstat (limited to 'java/src/Ice/ObjectPrxHelper.java')
| -rw-r--r-- | java/src/Ice/ObjectPrxHelper.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/java/src/Ice/ObjectPrxHelper.java b/java/src/Ice/ObjectPrxHelper.java index 8595d307e95..fc19e9f611f 100644 --- a/java/src/Ice/ObjectPrxHelper.java +++ b/java/src/Ice/ObjectPrxHelper.java @@ -186,13 +186,13 @@ public class ObjectPrxHelper implements ObjectPrx } public final boolean - ice_invoke(String operation, boolean nonmutating, byte[] inParams, ByteSeqHolder outParams) + ice_invoke(String operation, OperationMode mode, byte[] inParams, ByteSeqHolder outParams) { - return ice_invoke(operation, nonmutating, inParams, outParams, null); + return ice_invoke(operation, mode, inParams, outParams, null); } public final boolean - ice_invoke(String operation, boolean nonmutating, byte[] inParams, ByteSeqHolder outParams, + ice_invoke(String operation, OperationMode mode, byte[] inParams, ByteSeqHolder outParams, java.util.Map __context) { int __cnt = 0; @@ -201,7 +201,7 @@ public class ObjectPrxHelper implements ObjectPrx try { _ObjectDel __del = __getDelegate(); - return __del.ice_invoke(operation, nonmutating, inParams, outParams, __context); + return __del.ice_invoke(operation, mode, inParams, outParams, __context); } catch(LocationForward __ex) { @@ -209,7 +209,7 @@ public class ObjectPrxHelper implements ObjectPrx } catch(IceInternal.NonRepeatable __ex) { - if(nonmutating) + if(mode == OperationMode.Nonmutating || mode == OperationMode.Idempotent) { __cnt = __handleException(__ex.get(), __cnt); } |