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, 4 insertions, 4 deletions

diff --git a/cpp/src/IceStorm/TopicI.cpp b/cpp/src/IceStorm/TopicI.cpp
index e733b675442..10fd13fe4ed 100644
--- a/cpp/src/IceStorm/TopicI.cpp
+++ b/cpp/src/IceStorm/TopicI.cpp
@@ -73,7 +73,7 @@ public:
     {
     }
 
-    virtual void forward(const string&, bool, const ByteSeq&, const ContextData&, const Ice::Current&);
+    virtual void forward(const string&, ::Ice::OperationMode, const ByteSeq&, const ContextData&, const Ice::Current&);
 
 private:
 
@@ -294,7 +294,7 @@ PublisherProxyI::ice_invoke(const vector< Ice::Byte>& inParams, vector< Ice::Byt
 	event.cost = 0; // TODO: Default comes from property?
     }
     event.op = current.operation;
-    event.idempotent = current.idempotent;
+    event.mode = current.mode;
     event.data = inParams;
     event.context = context;
 
@@ -307,14 +307,14 @@ PublisherProxyI::ice_invoke(const vector< Ice::Byte>& inParams, vector< Ice::Byt
 // Incoming events from linked topics.
 //
 void
-TopicLinkI::forward(const string& op, bool idempotent, const ByteSeq& data, const ContextData& context,
+TopicLinkI::forward(const string& op, Ice::OperationMode mode, const ByteSeq& data, const ContextData& context,
                     const Ice::Current& current)
 {
     Event event;
     event.forwarded = true;
     event.cost = 0;
     event.op = op;
-    event.idempotent = idempotent;
+    event.mode = mode;
     event.data = data;
     event.context = context;