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.

1 files changed, 10 insertions, 9 deletions

diff --git a/java/src/Ice/_ObjectDelD.java b/java/src/Ice/_ObjectDelD.java
index 5d397d2397c..390c6e70bdb 100644
--- a/java/src/Ice/_ObjectDelD.java
+++ b/java/src/Ice/_ObjectDelD.java
@@ -17,7 +17,7 @@ public class _ObjectDelD implements _ObjectDel
         throws LocationForward, IceInternal.NonRepeatable
     {
         Current __current = new Current();
-        __initCurrent(__current, "ice_isA", true, __context);
+        __initCurrent(__current, "ice_isA", OperationMode.Nonmutating, __context);
         while(true)
         {
             IceInternal.Direct __direct = new IceInternal.Direct(__adapter, __current);
@@ -52,7 +52,7 @@ public class _ObjectDelD implements _ObjectDel
         throws LocationForward, IceInternal.NonRepeatable
     {
         Current __current = new Current();
-        __initCurrent(__current, "ice_ping", true, __context);
+        __initCurrent(__current, "ice_ping", OperationMode.Nonmutating, __context);
         while(true)
         {
             IceInternal.Direct __direct = new IceInternal.Direct(__adapter, __current);
@@ -88,7 +88,7 @@ public class _ObjectDelD implements _ObjectDel
         throws LocationForward, IceInternal.NonRepeatable
     {
         Current __current = new Current();
-        __initCurrent(__current, "ice_ids", true, __context);
+        __initCurrent(__current, "ice_ids", OperationMode.Nonmutating, __context);
         while(true)
         {
             IceInternal.Direct __direct = new IceInternal.Direct(__adapter, __current);
@@ -123,7 +123,7 @@ public class _ObjectDelD implements _ObjectDel
         throws LocationForward, IceInternal.NonRepeatable
     {
         Current __current = new Current();
-        __initCurrent(__current, "ice_id", true, __context);
+        __initCurrent(__current, "ice_id", OperationMode.Nonmutating, __context);
         while(true)
         {
             IceInternal.Direct __direct = new IceInternal.Direct(__adapter, __current);
@@ -158,7 +158,7 @@ public class _ObjectDelD implements _ObjectDel
         throws LocationForward, IceInternal.NonRepeatable
     {
         Current __current = new Current();
-        __initCurrent(__current, "ice_facets", true, __context);
+        __initCurrent(__current, "ice_facets", OperationMode.Nonmutating, __context);
         while(true)
         {
             IceInternal.Direct __direct = new IceInternal.Direct(__adapter, __current);
@@ -189,11 +189,12 @@ public class _ObjectDelD implements _ObjectDel
     }
 
     public boolean
-    ice_invoke(String operation, boolean idempotent, byte[] inParams, ByteSeqHolder outParams, java.util.Map context)
+    ice_invoke(String operation, Ice.OperationMode mode, byte[] inParams, ByteSeqHolder outParams,
+               java.util.Map context)
         throws LocationForward, IceInternal.NonRepeatable
     {
         Current current = new Current();
-        __initCurrent(current, operation, idempotent, context);
+        __initCurrent(current, operation, mode, context);
         while(true)
         {
             IceInternal.Direct __direct = new IceInternal.Direct(__adapter, current);
@@ -264,12 +265,12 @@ public class _ObjectDelD implements _ObjectDel
     protected IceInternal.Reference __reference;
 
     protected final void
-    __initCurrent(Current current, String op, boolean idempotent, java.util.Map context)
+    __initCurrent(Current current, String op, Ice.OperationMode mode, java.util.Map context)
     {
         current.id = __reference.identity;
         current.facet = __reference.facet;
         current.operation = op;
-        current.idempotent = idempotent;
+        current.mode = mode;
         current.ctx = context;
     }