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/IceInternal/Outgoing.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/IceInternal/Outgoing.java')
| -rw-r--r-- | java/src/IceInternal/Outgoing.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/java/src/IceInternal/Outgoing.java b/java/src/IceInternal/Outgoing.java index 0bfe02b2cb8..be522da8b84 100644 --- a/java/src/IceInternal/Outgoing.java +++ b/java/src/IceInternal/Outgoing.java @@ -13,7 +13,7 @@ package IceInternal; public final class Outgoing { public - Outgoing(Connection connection, Reference ref, String operation, boolean idempotent, java.util.Map context) + Outgoing(Connection connection, Reference ref, String operation, Ice.OperationMode mode, java.util.Map context) { _connection = connection; _reference = ref; @@ -21,11 +21,11 @@ public final class Outgoing _is = new BasicStream(ref.instance); _os = new BasicStream(ref.instance); - writeHeader(operation, idempotent, context); + writeHeader(operation, mode, context); } public void - reset(String operation, boolean idempotent, java.util.Map context) + reset(String operation, Ice.OperationMode mode, java.util.Map context) { _state = StateUnsent; _exception = null; @@ -34,7 +34,7 @@ public final class Outgoing _is.reset(); _os.reset(); - writeHeader(operation, idempotent, context); + writeHeader(operation, mode, context); } public void @@ -310,7 +310,7 @@ public final class Outgoing } private void - writeHeader(String operation, boolean idempotent, java.util.Map context) + writeHeader(String operation, Ice.OperationMode mode, java.util.Map context) { switch(_reference.mode) { @@ -333,7 +333,7 @@ public final class Outgoing _reference.identity.__write(_os); _os.writeStringSeq(_reference.facet); _os.writeString(operation); - _os.writeBool(idempotent); + _os.writeByte((byte)mode.value()); if(context == null) { _os.writeSize(0); |