activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r381926 [7/8] - in /incubator/activemq/trunk: activemq-core/src/gram/java/org/apache/activemq/openwire/tool/ activemq-core/src/gram/script/ activemq-core/src/main/java/org/apache/activemq/command/ activemq-core/src/main/java/org/apache/acti...
Date Wed, 01 Mar 2006 06:29:57 GMT
Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/ActiveMQStreamMessageMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/ActiveMQStreamMessageMarshaller.cs?rev=381926&r1=381925&r2=381926&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/ActiveMQStreamMessageMarshaller.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/ActiveMQStreamMessageMarshaller.cs Tue Feb 28 22:29:45 2006
@@ -51,9 +51,9 @@
     // 
     // Un-marshal an object instance from the data input stream
     // 
-    public override void Unmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
+    public override void TightUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
     {
-        base.Unmarshal(wireFormat, o, dataIn, bs);
+        base.TightUnmarshal(wireFormat, o, dataIn, bs);
 
     }
 
@@ -61,10 +61,10 @@
     //
     // Write the booleans that this object uses to a BooleanStream
     //
-    public override int Marshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
+    public override int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
         ActiveMQStreamMessage info = (ActiveMQStreamMessage)o;
 
-        int rc = base.Marshal1(wireFormat, info, bs);
+        int rc = base.TightMarshal1(wireFormat, info, bs);
 
         return rc + 0;
     }
@@ -72,8 +72,8 @@
     // 
     // Write a object instance to data output stream
     //
-    public override void Marshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
-        base.Marshal2(wireFormat, o, dataOut, bs);
+    public override void TightMarshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
+        base.TightMarshal2(wireFormat, o, dataOut, bs);
 
     }
   }

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/ActiveMQTempDestinationMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/ActiveMQTempDestinationMarshaller.cs?rev=381926&r1=381925&r2=381926&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/ActiveMQTempDestinationMarshaller.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/ActiveMQTempDestinationMarshaller.cs Tue Feb 28 22:29:45 2006
@@ -40,9 +40,9 @@
     // 
     // Un-marshal an object instance from the data input stream
     // 
-    public override void Unmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
+    public override void TightUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
     {
-        base.Unmarshal(wireFormat, o, dataIn, bs);
+        base.TightUnmarshal(wireFormat, o, dataIn, bs);
 
     }
 
@@ -50,10 +50,10 @@
     //
     // Write the booleans that this object uses to a BooleanStream
     //
-    public override int Marshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
+    public override int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
         ActiveMQTempDestination info = (ActiveMQTempDestination)o;
 
-        int rc = base.Marshal1(wireFormat, info, bs);
+        int rc = base.TightMarshal1(wireFormat, info, bs);
 
         return rc + 0;
     }
@@ -61,8 +61,8 @@
     // 
     // Write a object instance to data output stream
     //
-    public override void Marshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
-        base.Marshal2(wireFormat, o, dataOut, bs);
+    public override void TightMarshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
+        base.TightMarshal2(wireFormat, o, dataOut, bs);
 
     }
   }

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/ActiveMQTempQueueMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/ActiveMQTempQueueMarshaller.cs?rev=381926&r1=381925&r2=381926&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/ActiveMQTempQueueMarshaller.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/ActiveMQTempQueueMarshaller.cs Tue Feb 28 22:29:45 2006
@@ -51,9 +51,9 @@
     // 
     // Un-marshal an object instance from the data input stream
     // 
-    public override void Unmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
+    public override void TightUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
     {
-        base.Unmarshal(wireFormat, o, dataIn, bs);
+        base.TightUnmarshal(wireFormat, o, dataIn, bs);
 
     }
 
@@ -61,10 +61,10 @@
     //
     // Write the booleans that this object uses to a BooleanStream
     //
-    public override int Marshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
+    public override int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
         ActiveMQTempQueue info = (ActiveMQTempQueue)o;
 
-        int rc = base.Marshal1(wireFormat, info, bs);
+        int rc = base.TightMarshal1(wireFormat, info, bs);
 
         return rc + 0;
     }
@@ -72,8 +72,8 @@
     // 
     // Write a object instance to data output stream
     //
-    public override void Marshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
-        base.Marshal2(wireFormat, o, dataOut, bs);
+    public override void TightMarshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
+        base.TightMarshal2(wireFormat, o, dataOut, bs);
 
     }
   }

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/ActiveMQTempTopicMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/ActiveMQTempTopicMarshaller.cs?rev=381926&r1=381925&r2=381926&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/ActiveMQTempTopicMarshaller.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/ActiveMQTempTopicMarshaller.cs Tue Feb 28 22:29:45 2006
@@ -51,9 +51,9 @@
     // 
     // Un-marshal an object instance from the data input stream
     // 
-    public override void Unmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
+    public override void TightUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
     {
-        base.Unmarshal(wireFormat, o, dataIn, bs);
+        base.TightUnmarshal(wireFormat, o, dataIn, bs);
 
     }
 
@@ -61,10 +61,10 @@
     //
     // Write the booleans that this object uses to a BooleanStream
     //
-    public override int Marshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
+    public override int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
         ActiveMQTempTopic info = (ActiveMQTempTopic)o;
 
-        int rc = base.Marshal1(wireFormat, info, bs);
+        int rc = base.TightMarshal1(wireFormat, info, bs);
 
         return rc + 0;
     }
@@ -72,8 +72,8 @@
     // 
     // Write a object instance to data output stream
     //
-    public override void Marshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
-        base.Marshal2(wireFormat, o, dataOut, bs);
+    public override void TightMarshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
+        base.TightMarshal2(wireFormat, o, dataOut, bs);
 
     }
   }

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/ActiveMQTextMessageMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/ActiveMQTextMessageMarshaller.cs?rev=381926&r1=381925&r2=381926&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/ActiveMQTextMessageMarshaller.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/ActiveMQTextMessageMarshaller.cs Tue Feb 28 22:29:45 2006
@@ -51,9 +51,9 @@
     // 
     // Un-marshal an object instance from the data input stream
     // 
-    public override void Unmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
+    public override void TightUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
     {
-        base.Unmarshal(wireFormat, o, dataIn, bs);
+        base.TightUnmarshal(wireFormat, o, dataIn, bs);
 
     }
 
@@ -61,10 +61,10 @@
     //
     // Write the booleans that this object uses to a BooleanStream
     //
-    public override int Marshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
+    public override int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
         ActiveMQTextMessage info = (ActiveMQTextMessage)o;
 
-        int rc = base.Marshal1(wireFormat, info, bs);
+        int rc = base.TightMarshal1(wireFormat, info, bs);
 
         return rc + 0;
     }
@@ -72,8 +72,8 @@
     // 
     // Write a object instance to data output stream
     //
-    public override void Marshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
-        base.Marshal2(wireFormat, o, dataOut, bs);
+    public override void TightMarshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
+        base.TightMarshal2(wireFormat, o, dataOut, bs);
 
     }
   }

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/ActiveMQTopicMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/ActiveMQTopicMarshaller.cs?rev=381926&r1=381925&r2=381926&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/ActiveMQTopicMarshaller.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/ActiveMQTopicMarshaller.cs Tue Feb 28 22:29:45 2006
@@ -51,9 +51,9 @@
     // 
     // Un-marshal an object instance from the data input stream
     // 
-    public override void Unmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
+    public override void TightUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
     {
-        base.Unmarshal(wireFormat, o, dataIn, bs);
+        base.TightUnmarshal(wireFormat, o, dataIn, bs);
 
     }
 
@@ -61,10 +61,10 @@
     //
     // Write the booleans that this object uses to a BooleanStream
     //
-    public override int Marshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
+    public override int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
         ActiveMQTopic info = (ActiveMQTopic)o;
 
-        int rc = base.Marshal1(wireFormat, info, bs);
+        int rc = base.TightMarshal1(wireFormat, info, bs);
 
         return rc + 0;
     }
@@ -72,8 +72,8 @@
     // 
     // Write a object instance to data output stream
     //
-    public override void Marshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
-        base.Marshal2(wireFormat, o, dataOut, bs);
+    public override void TightMarshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
+        base.TightMarshal2(wireFormat, o, dataOut, bs);
 
     }
   }

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/BaseCommandMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/BaseCommandMarshaller.cs?rev=381926&r1=381925&r2=381926&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/BaseCommandMarshaller.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/BaseCommandMarshaller.cs Tue Feb 28 22:29:45 2006
@@ -34,18 +34,18 @@
   //        if you need to make a change, please see the Groovy scripts in the
   //        activemq-core module
   //
-  public abstract class BaseCommandMarshaller : DataStreamMarshaller
+  public abstract class BaseCommandMarshaller : BaseDataStreamMarshaller
   {
 
     // 
     // Un-marshal an object instance from the data input stream
     // 
-    public override void Unmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
+    public override void TightUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
     {
-        base.Unmarshal(wireFormat, o, dataIn, bs);
+        base.TightUnmarshal(wireFormat, o, dataIn, bs);
 
         BaseCommand info = (BaseCommand)o;
-        info.CommandId = DataStreamMarshaller.ReadShort(dataIn);
+        info.CommandId = BaseDataStreamMarshaller.ReadShort(dataIn);
         info.ResponseRequired = bs.ReadBoolean();
 
     }
@@ -54,23 +54,23 @@
     //
     // Write the booleans that this object uses to a BooleanStream
     //
-    public override int Marshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
+    public override int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
         BaseCommand info = (BaseCommand)o;
 
-        int rc = base.Marshal1(wireFormat, info, bs);
+        int rc = base.TightMarshal1(wireFormat, info, bs);
         bs.WriteBoolean(info.ResponseRequired);
 
-        return rc + 1;
+        return rc + 2;
     }
 
     // 
     // Write a object instance to data output stream
     //
-    public override void Marshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
-        base.Marshal2(wireFormat, o, dataOut, bs);
+    public override void TightMarshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
+        base.TightMarshal2(wireFormat, o, dataOut, bs);
 
         BaseCommand info = (BaseCommand)o;
-    DataStreamMarshaller.WriteShort(info.CommandId, dataOut);
+    BaseDataStreamMarshaller.WriteShort(info.CommandId, dataOut);
     bs.ReadBoolean();
 
     }

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/BrokerIdMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/BrokerIdMarshaller.cs?rev=381926&r1=381925&r2=381926&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/BrokerIdMarshaller.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/BrokerIdMarshaller.cs Tue Feb 28 22:29:45 2006
@@ -34,7 +34,7 @@
   //        if you need to make a change, please see the Groovy scripts in the
   //        activemq-core module
   //
-  public class BrokerIdMarshaller : DataStreamMarshaller
+  public class BrokerIdMarshaller : BaseDataStreamMarshaller
   {
 
 
@@ -51,12 +51,12 @@
     // 
     // Un-marshal an object instance from the data input stream
     // 
-    public override void Unmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
+    public override void TightUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
     {
-        base.Unmarshal(wireFormat, o, dataIn, bs);
+        base.TightUnmarshal(wireFormat, o, dataIn, bs);
 
         BrokerId info = (BrokerId)o;
-        info.Value = ReadString(dataIn, bs);
+        info.Value = TightUnmarshalString(dataIn, bs);
 
     }
 
@@ -64,11 +64,11 @@
     //
     // Write the booleans that this object uses to a BooleanStream
     //
-    public override int Marshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
+    public override int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
         BrokerId info = (BrokerId)o;
 
-        int rc = base.Marshal1(wireFormat, info, bs);
-    rc += WriteString(info.Value, bs);
+        int rc = base.TightMarshal1(wireFormat, info, bs);
+    rc += TightMarshalString1(info.Value, bs);
 
         return rc + 0;
     }
@@ -76,11 +76,11 @@
     // 
     // Write a object instance to data output stream
     //
-    public override void Marshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
-        base.Marshal2(wireFormat, o, dataOut, bs);
+    public override void TightMarshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
+        base.TightMarshal2(wireFormat, o, dataOut, bs);
 
         BrokerId info = (BrokerId)o;
-    WriteString(info.Value, dataOut, bs);
+    TightMarshalString2(info.Value, dataOut, bs);
 
     }
   }

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/BrokerInfoMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/BrokerInfoMarshaller.cs?rev=381926&r1=381925&r2=381926&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/BrokerInfoMarshaller.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/BrokerInfoMarshaller.cs Tue Feb 28 22:29:45 2006
@@ -51,26 +51,26 @@
     // 
     // Un-marshal an object instance from the data input stream
     // 
-    public override void Unmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
+    public override void TightUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
     {
-        base.Unmarshal(wireFormat, o, dataIn, bs);
+        base.TightUnmarshal(wireFormat, o, dataIn, bs);
 
         BrokerInfo info = (BrokerInfo)o;
-        info.BrokerId = (BrokerId) UnmarshalCachedObject(wireFormat, dataIn, bs);
-        info.BrokerURL = ReadString(dataIn, bs);
+        info.BrokerId = (BrokerId) TightUnmarshalCachedObject(wireFormat, dataIn, bs);
+        info.BrokerURL = TightUnmarshalString(dataIn, bs);
 
         if (bs.ReadBoolean()) {
-            short size = DataStreamMarshaller.ReadShort(dataIn);
+            short size = BaseDataStreamMarshaller.ReadShort(dataIn);
             BrokerInfo[] value = new BrokerInfo[size];
             for( int i=0; i < size; i++ ) {
-                value[i] = (BrokerInfo) UnmarshalNestedObject(wireFormat,dataIn, bs);
+                value[i] = (BrokerInfo) TightUnmarshalNestedObject(wireFormat,dataIn, bs);
             }
             info.PeerBrokerInfos = value;
         }
         else {
             info.PeerBrokerInfos = null;
         }
-        info.BrokerName = ReadString(dataIn, bs);
+        info.BrokerName = TightUnmarshalString(dataIn, bs);
         info.SlaveBroker = bs.ReadBoolean();
 
     }
@@ -79,14 +79,14 @@
     //
     // Write the booleans that this object uses to a BooleanStream
     //
-    public override int Marshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
+    public override int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
         BrokerInfo info = (BrokerInfo)o;
 
-        int rc = base.Marshal1(wireFormat, info, bs);
-    rc += Marshal1CachedObject(wireFormat, info.BrokerId, bs);
-    rc += WriteString(info.BrokerURL, bs);
-    rc += MarshalObjectArray(wireFormat, info.PeerBrokerInfos, bs);
-    rc += WriteString(info.BrokerName, bs);
+        int rc = base.TightMarshal1(wireFormat, info, bs);
+    rc += TightMarshalCachedObject1(wireFormat, info.BrokerId, bs);
+    rc += TightMarshalString1(info.BrokerURL, bs);
+    rc += TightMarshalObjectArray1(wireFormat, info.PeerBrokerInfos, bs);
+    rc += TightMarshalString1(info.BrokerName, bs);
     bs.WriteBoolean(info.SlaveBroker);
 
         return rc + 0;
@@ -95,14 +95,14 @@
     // 
     // Write a object instance to data output stream
     //
-    public override void Marshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
-        base.Marshal2(wireFormat, o, dataOut, bs);
+    public override void TightMarshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
+        base.TightMarshal2(wireFormat, o, dataOut, bs);
 
         BrokerInfo info = (BrokerInfo)o;
-    Marshal2CachedObject(wireFormat, info.BrokerId, dataOut, bs);
-    WriteString(info.BrokerURL, dataOut, bs);
-    MarshalObjectArray(wireFormat, info.PeerBrokerInfos, dataOut, bs);
-    WriteString(info.BrokerName, dataOut, bs);
+    TightMarshalCachedObject2(wireFormat, info.BrokerId, dataOut, bs);
+    TightMarshalString2(info.BrokerURL, dataOut, bs);
+    TightMarshalObjectArray2(wireFormat, info.PeerBrokerInfos, dataOut, bs);
+    TightMarshalString2(info.BrokerName, dataOut, bs);
     bs.ReadBoolean();
 
     }

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/ConnectionErrorMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/ConnectionErrorMarshaller.cs?rev=381926&r1=381925&r2=381926&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/ConnectionErrorMarshaller.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/ConnectionErrorMarshaller.cs Tue Feb 28 22:29:45 2006
@@ -51,13 +51,13 @@
     // 
     // Un-marshal an object instance from the data input stream
     // 
-    public override void Unmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
+    public override void TightUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
     {
-        base.Unmarshal(wireFormat, o, dataIn, bs);
+        base.TightUnmarshal(wireFormat, o, dataIn, bs);
 
         ConnectionError info = (ConnectionError)o;
-        info.Exception = UnmarshalBrokerError(wireFormat, dataIn, bs);
-        info.ConnectionId = (ConnectionId) UnmarshalNestedObject(wireFormat, dataIn, bs);
+        info.Exception = TightUnmarshalBrokerError(wireFormat, dataIn, bs);
+        info.ConnectionId = (ConnectionId) TightUnmarshalNestedObject(wireFormat, dataIn, bs);
 
     }
 
@@ -65,12 +65,12 @@
     //
     // Write the booleans that this object uses to a BooleanStream
     //
-    public override int Marshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
+    public override int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
         ConnectionError info = (ConnectionError)o;
 
-        int rc = base.Marshal1(wireFormat, info, bs);
-    rc += MarshalBrokerError(wireFormat, info.Exception, bs);
-    rc += Marshal1NestedObject(wireFormat, info.ConnectionId, bs);
+        int rc = base.TightMarshal1(wireFormat, info, bs);
+    rc += TightMarshalBrokerError1(wireFormat, info.Exception, bs);
+    rc += TightMarshalNestedObject1(wireFormat, info.ConnectionId, bs);
 
         return rc + 0;
     }
@@ -78,12 +78,12 @@
     // 
     // Write a object instance to data output stream
     //
-    public override void Marshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
-        base.Marshal2(wireFormat, o, dataOut, bs);
+    public override void TightMarshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
+        base.TightMarshal2(wireFormat, o, dataOut, bs);
 
         ConnectionError info = (ConnectionError)o;
-    MarshalBrokerError(wireFormat, info.Exception, dataOut, bs);
-    Marshal2NestedObject(wireFormat, info.ConnectionId, dataOut, bs);
+    TightMarshalBrokerError2(wireFormat, info.Exception, dataOut, bs);
+    TightMarshalNestedObject2(wireFormat, info.ConnectionId, dataOut, bs);
 
     }
   }

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/ConnectionIdMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/ConnectionIdMarshaller.cs?rev=381926&r1=381925&r2=381926&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/ConnectionIdMarshaller.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/ConnectionIdMarshaller.cs Tue Feb 28 22:29:45 2006
@@ -34,7 +34,7 @@
   //        if you need to make a change, please see the Groovy scripts in the
   //        activemq-core module
   //
-  public class ConnectionIdMarshaller : DataStreamMarshaller
+  public class ConnectionIdMarshaller : BaseDataStreamMarshaller
   {
 
 
@@ -51,12 +51,12 @@
     // 
     // Un-marshal an object instance from the data input stream
     // 
-    public override void Unmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
+    public override void TightUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
     {
-        base.Unmarshal(wireFormat, o, dataIn, bs);
+        base.TightUnmarshal(wireFormat, o, dataIn, bs);
 
         ConnectionId info = (ConnectionId)o;
-        info.Value = ReadString(dataIn, bs);
+        info.Value = TightUnmarshalString(dataIn, bs);
 
     }
 
@@ -64,11 +64,11 @@
     //
     // Write the booleans that this object uses to a BooleanStream
     //
-    public override int Marshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
+    public override int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
         ConnectionId info = (ConnectionId)o;
 
-        int rc = base.Marshal1(wireFormat, info, bs);
-    rc += WriteString(info.Value, bs);
+        int rc = base.TightMarshal1(wireFormat, info, bs);
+    rc += TightMarshalString1(info.Value, bs);
 
         return rc + 0;
     }
@@ -76,11 +76,11 @@
     // 
     // Write a object instance to data output stream
     //
-    public override void Marshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
-        base.Marshal2(wireFormat, o, dataOut, bs);
+    public override void TightMarshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
+        base.TightMarshal2(wireFormat, o, dataOut, bs);
 
         ConnectionId info = (ConnectionId)o;
-    WriteString(info.Value, dataOut, bs);
+    TightMarshalString2(info.Value, dataOut, bs);
 
     }
   }

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/ConnectionInfoMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/ConnectionInfoMarshaller.cs?rev=381926&r1=381925&r2=381926&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/ConnectionInfoMarshaller.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/ConnectionInfoMarshaller.cs Tue Feb 28 22:29:45 2006
@@ -51,21 +51,21 @@
     // 
     // Un-marshal an object instance from the data input stream
     // 
-    public override void Unmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
+    public override void TightUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
     {
-        base.Unmarshal(wireFormat, o, dataIn, bs);
+        base.TightUnmarshal(wireFormat, o, dataIn, bs);
 
         ConnectionInfo info = (ConnectionInfo)o;
-        info.ConnectionId = (ConnectionId) UnmarshalCachedObject(wireFormat, dataIn, bs);
-        info.ClientId = ReadString(dataIn, bs);
-        info.Password = ReadString(dataIn, bs);
-        info.UserName = ReadString(dataIn, bs);
+        info.ConnectionId = (ConnectionId) TightUnmarshalCachedObject(wireFormat, dataIn, bs);
+        info.ClientId = TightUnmarshalString(dataIn, bs);
+        info.Password = TightUnmarshalString(dataIn, bs);
+        info.UserName = TightUnmarshalString(dataIn, bs);
 
         if (bs.ReadBoolean()) {
-            short size = DataStreamMarshaller.ReadShort(dataIn);
+            short size = BaseDataStreamMarshaller.ReadShort(dataIn);
             BrokerId[] value = new BrokerId[size];
             for( int i=0; i < size; i++ ) {
-                value[i] = (BrokerId) UnmarshalNestedObject(wireFormat,dataIn, bs);
+                value[i] = (BrokerId) TightUnmarshalNestedObject(wireFormat,dataIn, bs);
             }
             info.BrokerPath = value;
         }
@@ -79,15 +79,15 @@
     //
     // Write the booleans that this object uses to a BooleanStream
     //
-    public override int Marshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
+    public override int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
         ConnectionInfo info = (ConnectionInfo)o;
 
-        int rc = base.Marshal1(wireFormat, info, bs);
-    rc += Marshal1CachedObject(wireFormat, info.ConnectionId, bs);
-    rc += WriteString(info.ClientId, bs);
-    rc += WriteString(info.Password, bs);
-    rc += WriteString(info.UserName, bs);
-    rc += MarshalObjectArray(wireFormat, info.BrokerPath, bs);
+        int rc = base.TightMarshal1(wireFormat, info, bs);
+    rc += TightMarshalCachedObject1(wireFormat, info.ConnectionId, bs);
+    rc += TightMarshalString1(info.ClientId, bs);
+    rc += TightMarshalString1(info.Password, bs);
+    rc += TightMarshalString1(info.UserName, bs);
+    rc += TightMarshalObjectArray1(wireFormat, info.BrokerPath, bs);
 
         return rc + 0;
     }
@@ -95,15 +95,15 @@
     // 
     // Write a object instance to data output stream
     //
-    public override void Marshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
-        base.Marshal2(wireFormat, o, dataOut, bs);
+    public override void TightMarshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
+        base.TightMarshal2(wireFormat, o, dataOut, bs);
 
         ConnectionInfo info = (ConnectionInfo)o;
-    Marshal2CachedObject(wireFormat, info.ConnectionId, dataOut, bs);
-    WriteString(info.ClientId, dataOut, bs);
-    WriteString(info.Password, dataOut, bs);
-    WriteString(info.UserName, dataOut, bs);
-    MarshalObjectArray(wireFormat, info.BrokerPath, dataOut, bs);
+    TightMarshalCachedObject2(wireFormat, info.ConnectionId, dataOut, bs);
+    TightMarshalString2(info.ClientId, dataOut, bs);
+    TightMarshalString2(info.Password, dataOut, bs);
+    TightMarshalString2(info.UserName, dataOut, bs);
+    TightMarshalObjectArray2(wireFormat, info.BrokerPath, dataOut, bs);
 
     }
   }

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/ConsumerIdMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/ConsumerIdMarshaller.cs?rev=381926&r1=381925&r2=381926&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/ConsumerIdMarshaller.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/ConsumerIdMarshaller.cs Tue Feb 28 22:29:45 2006
@@ -34,7 +34,7 @@
   //        if you need to make a change, please see the Groovy scripts in the
   //        activemq-core module
   //
-  public class ConsumerIdMarshaller : DataStreamMarshaller
+  public class ConsumerIdMarshaller : BaseDataStreamMarshaller
   {
 
 
@@ -51,14 +51,14 @@
     // 
     // Un-marshal an object instance from the data input stream
     // 
-    public override void Unmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
+    public override void TightUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
     {
-        base.Unmarshal(wireFormat, o, dataIn, bs);
+        base.TightUnmarshal(wireFormat, o, dataIn, bs);
 
         ConsumerId info = (ConsumerId)o;
-        info.ConnectionId = ReadString(dataIn, bs);
-        info.SessionId = UnmarshalLong(wireFormat, dataIn, bs);
-        info.Value = UnmarshalLong(wireFormat, dataIn, bs);
+        info.ConnectionId = TightUnmarshalString(dataIn, bs);
+        info.SessionId = TightUnmarshalLong(wireFormat, dataIn, bs);
+        info.Value = TightUnmarshalLong(wireFormat, dataIn, bs);
 
     }
 
@@ -66,13 +66,13 @@
     //
     // Write the booleans that this object uses to a BooleanStream
     //
-    public override int Marshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
+    public override int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
         ConsumerId info = (ConsumerId)o;
 
-        int rc = base.Marshal1(wireFormat, info, bs);
-    rc += WriteString(info.ConnectionId, bs);
-    rc += Marshal1Long(wireFormat, info.SessionId, bs);
-    rc += Marshal1Long(wireFormat, info.Value, bs);
+        int rc = base.TightMarshal1(wireFormat, info, bs);
+    rc += TightMarshalString1(info.ConnectionId, bs);
+    rc += TightMarshalLong1(wireFormat, info.SessionId, bs);
+    rc += TightMarshalLong1(wireFormat, info.Value, bs);
 
         return rc + 0;
     }
@@ -80,13 +80,13 @@
     // 
     // Write a object instance to data output stream
     //
-    public override void Marshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
-        base.Marshal2(wireFormat, o, dataOut, bs);
+    public override void TightMarshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
+        base.TightMarshal2(wireFormat, o, dataOut, bs);
 
         ConsumerId info = (ConsumerId)o;
-    WriteString(info.ConnectionId, dataOut, bs);
-    Marshal2Long(wireFormat, info.SessionId, dataOut, bs);
-    Marshal2Long(wireFormat, info.Value, dataOut, bs);
+    TightMarshalString2(info.ConnectionId, dataOut, bs);
+    TightMarshalLong2(wireFormat, info.SessionId, dataOut, bs);
+    TightMarshalLong2(wireFormat, info.Value, dataOut, bs);
 
     }
   }

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/ConsumerInfoMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/ConsumerInfoMarshaller.cs?rev=381926&r1=381925&r2=381926&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/ConsumerInfoMarshaller.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/ConsumerInfoMarshaller.cs Tue Feb 28 22:29:45 2006
@@ -51,28 +51,28 @@
     // 
     // Un-marshal an object instance from the data input stream
     // 
-    public override void Unmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
+    public override void TightUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
     {
-        base.Unmarshal(wireFormat, o, dataIn, bs);
+        base.TightUnmarshal(wireFormat, o, dataIn, bs);
 
         ConsumerInfo info = (ConsumerInfo)o;
-        info.ConsumerId = (ConsumerId) UnmarshalCachedObject(wireFormat, dataIn, bs);
+        info.ConsumerId = (ConsumerId) TightUnmarshalCachedObject(wireFormat, dataIn, bs);
         info.Browser = bs.ReadBoolean();
-        info.Destination = (ActiveMQDestination) UnmarshalCachedObject(wireFormat, dataIn, bs);
-        info.PrefetchSize = DataStreamMarshaller.ReadInt(dataIn);
+        info.Destination = (ActiveMQDestination) TightUnmarshalCachedObject(wireFormat, dataIn, bs);
+        info.PrefetchSize = BaseDataStreamMarshaller.ReadInt(dataIn);
         info.DispatchAsync = bs.ReadBoolean();
-        info.Selector = ReadString(dataIn, bs);
-        info.SubcriptionName = ReadString(dataIn, bs);
+        info.Selector = TightUnmarshalString(dataIn, bs);
+        info.SubcriptionName = TightUnmarshalString(dataIn, bs);
         info.NoLocal = bs.ReadBoolean();
         info.Exclusive = bs.ReadBoolean();
         info.Retroactive = bs.ReadBoolean();
-        info.Priority = DataStreamMarshaller.ReadByte(dataIn);
+        info.Priority = BaseDataStreamMarshaller.ReadByte(dataIn);
 
         if (bs.ReadBoolean()) {
-            short size = DataStreamMarshaller.ReadShort(dataIn);
+            short size = BaseDataStreamMarshaller.ReadShort(dataIn);
             BrokerId[] value = new BrokerId[size];
             for( int i=0; i < size; i++ ) {
-                value[i] = (BrokerId) UnmarshalNestedObject(wireFormat,dataIn, bs);
+                value[i] = (BrokerId) TightUnmarshalNestedObject(wireFormat,dataIn, bs);
             }
             info.BrokerPath = value;
         }
@@ -87,44 +87,44 @@
     //
     // Write the booleans that this object uses to a BooleanStream
     //
-    public override int Marshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
+    public override int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
         ConsumerInfo info = (ConsumerInfo)o;
 
-        int rc = base.Marshal1(wireFormat, info, bs);
-    rc += Marshal1CachedObject(wireFormat, info.ConsumerId, bs);
+        int rc = base.TightMarshal1(wireFormat, info, bs);
+    rc += TightMarshalCachedObject1(wireFormat, info.ConsumerId, bs);
     bs.WriteBoolean(info.Browser);
-    rc += Marshal1CachedObject(wireFormat, info.Destination, bs);
+    rc += TightMarshalCachedObject1(wireFormat, info.Destination, bs);
         bs.WriteBoolean(info.DispatchAsync);
-    rc += WriteString(info.Selector, bs);
-    rc += WriteString(info.SubcriptionName, bs);
+    rc += TightMarshalString1(info.Selector, bs);
+    rc += TightMarshalString1(info.SubcriptionName, bs);
     bs.WriteBoolean(info.NoLocal);
     bs.WriteBoolean(info.Exclusive);
     bs.WriteBoolean(info.Retroactive);
-        rc += MarshalObjectArray(wireFormat, info.BrokerPath, bs);
+        rc += TightMarshalObjectArray1(wireFormat, info.BrokerPath, bs);
     bs.WriteBoolean(info.NetworkSubscription);
 
-        return rc + 2;
+        return rc + 5;
     }
 
     // 
     // Write a object instance to data output stream
     //
-    public override void Marshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
-        base.Marshal2(wireFormat, o, dataOut, bs);
+    public override void TightMarshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
+        base.TightMarshal2(wireFormat, o, dataOut, bs);
 
         ConsumerInfo info = (ConsumerInfo)o;
-    Marshal2CachedObject(wireFormat, info.ConsumerId, dataOut, bs);
+    TightMarshalCachedObject2(wireFormat, info.ConsumerId, dataOut, bs);
     bs.ReadBoolean();
-    Marshal2CachedObject(wireFormat, info.Destination, dataOut, bs);
-    DataStreamMarshaller.WriteInt(info.PrefetchSize, dataOut);
+    TightMarshalCachedObject2(wireFormat, info.Destination, dataOut, bs);
+    BaseDataStreamMarshaller.WriteInt(info.PrefetchSize, dataOut);
     bs.ReadBoolean();
-    WriteString(info.Selector, dataOut, bs);
-    WriteString(info.SubcriptionName, dataOut, bs);
+    TightMarshalString2(info.Selector, dataOut, bs);
+    TightMarshalString2(info.SubcriptionName, dataOut, bs);
     bs.ReadBoolean();
     bs.ReadBoolean();
     bs.ReadBoolean();
-    DataStreamMarshaller.WriteByte(info.Priority, dataOut);
-    MarshalObjectArray(wireFormat, info.BrokerPath, dataOut, bs);
+    BaseDataStreamMarshaller.WriteByte(info.Priority, dataOut);
+    TightMarshalObjectArray2(wireFormat, info.BrokerPath, dataOut, bs);
     bs.ReadBoolean();
 
     }

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/ControlCommandMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/ControlCommandMarshaller.cs?rev=381926&r1=381925&r2=381926&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/ControlCommandMarshaller.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/ControlCommandMarshaller.cs Tue Feb 28 22:29:45 2006
@@ -51,12 +51,12 @@
     // 
     // Un-marshal an object instance from the data input stream
     // 
-    public override void Unmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
+    public override void TightUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
     {
-        base.Unmarshal(wireFormat, o, dataIn, bs);
+        base.TightUnmarshal(wireFormat, o, dataIn, bs);
 
         ControlCommand info = (ControlCommand)o;
-        info.Command = ReadString(dataIn, bs);
+        info.Command = TightUnmarshalString(dataIn, bs);
 
     }
 
@@ -64,11 +64,11 @@
     //
     // Write the booleans that this object uses to a BooleanStream
     //
-    public override int Marshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
+    public override int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
         ControlCommand info = (ControlCommand)o;
 
-        int rc = base.Marshal1(wireFormat, info, bs);
-    rc += WriteString(info.Command, bs);
+        int rc = base.TightMarshal1(wireFormat, info, bs);
+    rc += TightMarshalString1(info.Command, bs);
 
         return rc + 0;
     }
@@ -76,11 +76,11 @@
     // 
     // Write a object instance to data output stream
     //
-    public override void Marshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
-        base.Marshal2(wireFormat, o, dataOut, bs);
+    public override void TightMarshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
+        base.TightMarshal2(wireFormat, o, dataOut, bs);
 
         ControlCommand info = (ControlCommand)o;
-    WriteString(info.Command, dataOut, bs);
+    TightMarshalString2(info.Command, dataOut, bs);
 
     }
   }

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/DataArrayResponseMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/DataArrayResponseMarshaller.cs?rev=381926&r1=381925&r2=381926&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/DataArrayResponseMarshaller.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/DataArrayResponseMarshaller.cs Tue Feb 28 22:29:45 2006
@@ -51,17 +51,17 @@
     // 
     // Un-marshal an object instance from the data input stream
     // 
-    public override void Unmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
+    public override void TightUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
     {
-        base.Unmarshal(wireFormat, o, dataIn, bs);
+        base.TightUnmarshal(wireFormat, o, dataIn, bs);
 
         DataArrayResponse info = (DataArrayResponse)o;
 
         if (bs.ReadBoolean()) {
-            short size = DataStreamMarshaller.ReadShort(dataIn);
+            short size = BaseDataStreamMarshaller.ReadShort(dataIn);
             DataStructure[] value = new DataStructure[size];
             for( int i=0; i < size; i++ ) {
-                value[i] = (DataStructure) UnmarshalNestedObject(wireFormat,dataIn, bs);
+                value[i] = (DataStructure) TightUnmarshalNestedObject(wireFormat,dataIn, bs);
             }
             info.Data = value;
         }
@@ -75,11 +75,11 @@
     //
     // Write the booleans that this object uses to a BooleanStream
     //
-    public override int Marshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
+    public override int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
         DataArrayResponse info = (DataArrayResponse)o;
 
-        int rc = base.Marshal1(wireFormat, info, bs);
-    rc += MarshalObjectArray(wireFormat, info.Data, bs);
+        int rc = base.TightMarshal1(wireFormat, info, bs);
+    rc += TightMarshalObjectArray1(wireFormat, info.Data, bs);
 
         return rc + 0;
     }
@@ -87,11 +87,11 @@
     // 
     // Write a object instance to data output stream
     //
-    public override void Marshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
-        base.Marshal2(wireFormat, o, dataOut, bs);
+    public override void TightMarshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
+        base.TightMarshal2(wireFormat, o, dataOut, bs);
 
         DataArrayResponse info = (DataArrayResponse)o;
-    MarshalObjectArray(wireFormat, info.Data, dataOut, bs);
+    TightMarshalObjectArray2(wireFormat, info.Data, dataOut, bs);
 
     }
   }

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/DataResponseMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/DataResponseMarshaller.cs?rev=381926&r1=381925&r2=381926&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/DataResponseMarshaller.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/DataResponseMarshaller.cs Tue Feb 28 22:29:45 2006
@@ -51,12 +51,12 @@
     // 
     // Un-marshal an object instance from the data input stream
     // 
-    public override void Unmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
+    public override void TightUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
     {
-        base.Unmarshal(wireFormat, o, dataIn, bs);
+        base.TightUnmarshal(wireFormat, o, dataIn, bs);
 
         DataResponse info = (DataResponse)o;
-        info.Data = (DataStructure) UnmarshalNestedObject(wireFormat, dataIn, bs);
+        info.Data = (DataStructure) TightUnmarshalNestedObject(wireFormat, dataIn, bs);
 
     }
 
@@ -64,11 +64,11 @@
     //
     // Write the booleans that this object uses to a BooleanStream
     //
-    public override int Marshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
+    public override int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
         DataResponse info = (DataResponse)o;
 
-        int rc = base.Marshal1(wireFormat, info, bs);
-    rc += Marshal1NestedObject(wireFormat, info.Data, bs);
+        int rc = base.TightMarshal1(wireFormat, info, bs);
+    rc += TightMarshalNestedObject1(wireFormat, info.Data, bs);
 
         return rc + 0;
     }
@@ -76,11 +76,11 @@
     // 
     // Write a object instance to data output stream
     //
-    public override void Marshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
-        base.Marshal2(wireFormat, o, dataOut, bs);
+    public override void TightMarshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
+        base.TightMarshal2(wireFormat, o, dataOut, bs);
 
         DataResponse info = (DataResponse)o;
-    Marshal2NestedObject(wireFormat, info.Data, dataOut, bs);
+    TightMarshalNestedObject2(wireFormat, info.Data, dataOut, bs);
 
     }
   }

Added: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/DataStructureSupportMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/DataStructureSupportMarshaller.cs?rev=381926&view=auto
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/DataStructureSupportMarshaller.cs (added)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/DataStructureSupportMarshaller.cs Tue Feb 28 22:29:45 2006
@@ -0,0 +1,69 @@
+//
+//
+// Copyright 2005-2006 The Apache Software Foundation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+using System;
+using System.Collections;
+using System.IO;
+
+using OpenWire.Client;
+using OpenWire.Client.Commands;
+using OpenWire.Client.Core;
+using OpenWire.Client.IO;
+
+namespace OpenWire.Client.IO
+{
+  //
+  //  Marshalling code for Open Wire Format for DataStructureSupport
+  //
+  //
+  //  NOTE!: This file is autogenerated - do not modify!
+  //        if you need to make a change, please see the Groovy scripts in the
+  //        activemq-core module
+  //
+  public abstract class DataStructureSupportMarshaller : BaseDataStreamMarshaller
+  {
+
+    // 
+    // Un-marshal an object instance from the data input stream
+    // 
+    public override void TightUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
+    {
+        base.TightUnmarshal(wireFormat, o, dataIn, bs);
+
+    }
+
+
+    //
+    // Write the booleans that this object uses to a BooleanStream
+    //
+    public override int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
+        DataStructureSupport info = (DataStructureSupport)o;
+
+        int rc = base.TightMarshal1(wireFormat, info, bs);
+
+        return rc + 0;
+    }
+
+    // 
+    // Write a object instance to data output stream
+    //
+    public override void TightMarshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
+        base.TightMarshal2(wireFormat, o, dataOut, bs);
+
+    }
+  }
+}

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/DestinationInfoMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/DestinationInfoMarshaller.cs?rev=381926&r1=381925&r2=381926&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/DestinationInfoMarshaller.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/DestinationInfoMarshaller.cs Tue Feb 28 22:29:45 2006
@@ -51,21 +51,21 @@
     // 
     // Un-marshal an object instance from the data input stream
     // 
-    public override void Unmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
+    public override void TightUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
     {
-        base.Unmarshal(wireFormat, o, dataIn, bs);
+        base.TightUnmarshal(wireFormat, o, dataIn, bs);
 
         DestinationInfo info = (DestinationInfo)o;
-        info.ConnectionId = (ConnectionId) UnmarshalCachedObject(wireFormat, dataIn, bs);
-        info.Destination = (ActiveMQDestination) UnmarshalCachedObject(wireFormat, dataIn, bs);
-        info.OperationType = DataStreamMarshaller.ReadByte(dataIn);
-        info.Timeout = UnmarshalLong(wireFormat, dataIn, bs);
+        info.ConnectionId = (ConnectionId) TightUnmarshalCachedObject(wireFormat, dataIn, bs);
+        info.Destination = (ActiveMQDestination) TightUnmarshalCachedObject(wireFormat, dataIn, bs);
+        info.OperationType = BaseDataStreamMarshaller.ReadByte(dataIn);
+        info.Timeout = TightUnmarshalLong(wireFormat, dataIn, bs);
 
         if (bs.ReadBoolean()) {
-            short size = DataStreamMarshaller.ReadShort(dataIn);
+            short size = BaseDataStreamMarshaller.ReadShort(dataIn);
             BrokerId[] value = new BrokerId[size];
             for( int i=0; i < size; i++ ) {
-                value[i] = (BrokerId) UnmarshalNestedObject(wireFormat,dataIn, bs);
+                value[i] = (BrokerId) TightUnmarshalNestedObject(wireFormat,dataIn, bs);
             }
             info.BrokerPath = value;
         }
@@ -79,14 +79,14 @@
     //
     // Write the booleans that this object uses to a BooleanStream
     //
-    public override int Marshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
+    public override int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
         DestinationInfo info = (DestinationInfo)o;
 
-        int rc = base.Marshal1(wireFormat, info, bs);
-    rc += Marshal1CachedObject(wireFormat, info.ConnectionId, bs);
-    rc += Marshal1CachedObject(wireFormat, info.Destination, bs);
-        rc += Marshal1Long(wireFormat, info.Timeout, bs);
-    rc += MarshalObjectArray(wireFormat, info.BrokerPath, bs);
+        int rc = base.TightMarshal1(wireFormat, info, bs);
+    rc += TightMarshalCachedObject1(wireFormat, info.ConnectionId, bs);
+    rc += TightMarshalCachedObject1(wireFormat, info.Destination, bs);
+        rc += TightMarshalLong1(wireFormat, info.Timeout, bs);
+    rc += TightMarshalObjectArray1(wireFormat, info.BrokerPath, bs);
 
         return rc + 1;
     }
@@ -94,15 +94,15 @@
     // 
     // Write a object instance to data output stream
     //
-    public override void Marshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
-        base.Marshal2(wireFormat, o, dataOut, bs);
+    public override void TightMarshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
+        base.TightMarshal2(wireFormat, o, dataOut, bs);
 
         DestinationInfo info = (DestinationInfo)o;
-    Marshal2CachedObject(wireFormat, info.ConnectionId, dataOut, bs);
-    Marshal2CachedObject(wireFormat, info.Destination, dataOut, bs);
-    DataStreamMarshaller.WriteByte(info.OperationType, dataOut);
-    Marshal2Long(wireFormat, info.Timeout, dataOut, bs);
-    MarshalObjectArray(wireFormat, info.BrokerPath, dataOut, bs);
+    TightMarshalCachedObject2(wireFormat, info.ConnectionId, dataOut, bs);
+    TightMarshalCachedObject2(wireFormat, info.Destination, dataOut, bs);
+    BaseDataStreamMarshaller.WriteByte(info.OperationType, dataOut);
+    TightMarshalLong2(wireFormat, info.Timeout, dataOut, bs);
+    TightMarshalObjectArray2(wireFormat, info.BrokerPath, dataOut, bs);
 
     }
   }

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/DiscoveryEventMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/DiscoveryEventMarshaller.cs?rev=381926&r1=381925&r2=381926&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/DiscoveryEventMarshaller.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/DiscoveryEventMarshaller.cs Tue Feb 28 22:29:45 2006
@@ -34,7 +34,7 @@
   //        if you need to make a change, please see the Groovy scripts in the
   //        activemq-core module
   //
-  public class DiscoveryEventMarshaller : DataStreamMarshaller
+  public class DiscoveryEventMarshaller : BaseDataStreamMarshaller
   {
 
 
@@ -51,13 +51,13 @@
     // 
     // Un-marshal an object instance from the data input stream
     // 
-    public override void Unmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
+    public override void TightUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
     {
-        base.Unmarshal(wireFormat, o, dataIn, bs);
+        base.TightUnmarshal(wireFormat, o, dataIn, bs);
 
         DiscoveryEvent info = (DiscoveryEvent)o;
-        info.ServiceName = ReadString(dataIn, bs);
-        info.BrokerName = ReadString(dataIn, bs);
+        info.ServiceName = TightUnmarshalString(dataIn, bs);
+        info.BrokerName = TightUnmarshalString(dataIn, bs);
 
     }
 
@@ -65,12 +65,12 @@
     //
     // Write the booleans that this object uses to a BooleanStream
     //
-    public override int Marshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
+    public override int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
         DiscoveryEvent info = (DiscoveryEvent)o;
 
-        int rc = base.Marshal1(wireFormat, info, bs);
-    rc += WriteString(info.ServiceName, bs);
-    rc += WriteString(info.BrokerName, bs);
+        int rc = base.TightMarshal1(wireFormat, info, bs);
+    rc += TightMarshalString1(info.ServiceName, bs);
+    rc += TightMarshalString1(info.BrokerName, bs);
 
         return rc + 0;
     }
@@ -78,12 +78,12 @@
     // 
     // Write a object instance to data output stream
     //
-    public override void Marshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
-        base.Marshal2(wireFormat, o, dataOut, bs);
+    public override void TightMarshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
+        base.TightMarshal2(wireFormat, o, dataOut, bs);
 
         DiscoveryEvent info = (DiscoveryEvent)o;
-    WriteString(info.ServiceName, dataOut, bs);
-    WriteString(info.BrokerName, dataOut, bs);
+    TightMarshalString2(info.ServiceName, dataOut, bs);
+    TightMarshalString2(info.BrokerName, dataOut, bs);
 
     }
   }

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/ExceptionResponseMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/ExceptionResponseMarshaller.cs?rev=381926&r1=381925&r2=381926&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/ExceptionResponseMarshaller.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/ExceptionResponseMarshaller.cs Tue Feb 28 22:29:45 2006
@@ -51,12 +51,12 @@
     // 
     // Un-marshal an object instance from the data input stream
     // 
-    public override void Unmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
+    public override void TightUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
     {
-        base.Unmarshal(wireFormat, o, dataIn, bs);
+        base.TightUnmarshal(wireFormat, o, dataIn, bs);
 
         ExceptionResponse info = (ExceptionResponse)o;
-        info.Exception = UnmarshalBrokerError(wireFormat, dataIn, bs);
+        info.Exception = TightUnmarshalBrokerError(wireFormat, dataIn, bs);
 
     }
 
@@ -64,11 +64,11 @@
     //
     // Write the booleans that this object uses to a BooleanStream
     //
-    public override int Marshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
+    public override int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
         ExceptionResponse info = (ExceptionResponse)o;
 
-        int rc = base.Marshal1(wireFormat, info, bs);
-    rc += MarshalBrokerError(wireFormat, info.Exception, bs);
+        int rc = base.TightMarshal1(wireFormat, info, bs);
+    rc += TightMarshalBrokerError1(wireFormat, info.Exception, bs);
 
         return rc + 0;
     }
@@ -76,11 +76,11 @@
     // 
     // Write a object instance to data output stream
     //
-    public override void Marshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
-        base.Marshal2(wireFormat, o, dataOut, bs);
+    public override void TightMarshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
+        base.TightMarshal2(wireFormat, o, dataOut, bs);
 
         ExceptionResponse info = (ExceptionResponse)o;
-    MarshalBrokerError(wireFormat, info.Exception, dataOut, bs);
+    TightMarshalBrokerError2(wireFormat, info.Exception, dataOut, bs);
 
     }
   }

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/FlushCommandMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/FlushCommandMarshaller.cs?rev=381926&r1=381925&r2=381926&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/FlushCommandMarshaller.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/FlushCommandMarshaller.cs Tue Feb 28 22:29:45 2006
@@ -51,9 +51,9 @@
     // 
     // Un-marshal an object instance from the data input stream
     // 
-    public override void Unmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
+    public override void TightUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
     {
-        base.Unmarshal(wireFormat, o, dataIn, bs);
+        base.TightUnmarshal(wireFormat, o, dataIn, bs);
 
     }
 
@@ -61,10 +61,10 @@
     //
     // Write the booleans that this object uses to a BooleanStream
     //
-    public override int Marshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
+    public override int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
         FlushCommand info = (FlushCommand)o;
 
-        int rc = base.Marshal1(wireFormat, info, bs);
+        int rc = base.TightMarshal1(wireFormat, info, bs);
 
         return rc + 0;
     }
@@ -72,8 +72,8 @@
     // 
     // Write a object instance to data output stream
     //
-    public override void Marshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
-        base.Marshal2(wireFormat, o, dataOut, bs);
+    public override void TightMarshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
+        base.TightMarshal2(wireFormat, o, dataOut, bs);
 
     }
   }

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/IntegerResponseMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/IntegerResponseMarshaller.cs?rev=381926&r1=381925&r2=381926&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/IntegerResponseMarshaller.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/IntegerResponseMarshaller.cs Tue Feb 28 22:29:45 2006
@@ -51,12 +51,12 @@
     // 
     // Un-marshal an object instance from the data input stream
     // 
-    public override void Unmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
+    public override void TightUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
     {
-        base.Unmarshal(wireFormat, o, dataIn, bs);
+        base.TightUnmarshal(wireFormat, o, dataIn, bs);
 
         IntegerResponse info = (IntegerResponse)o;
-        info.Result = DataStreamMarshaller.ReadInt(dataIn);
+        info.Result = BaseDataStreamMarshaller.ReadInt(dataIn);
 
     }
 
@@ -64,22 +64,22 @@
     //
     // Write the booleans that this object uses to a BooleanStream
     //
-    public override int Marshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
+    public override int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
         IntegerResponse info = (IntegerResponse)o;
 
-        int rc = base.Marshal1(wireFormat, info, bs);
+        int rc = base.TightMarshal1(wireFormat, info, bs);
     
-        return rc + 1;
+        return rc + 4;
     }
 
     // 
     // Write a object instance to data output stream
     //
-    public override void Marshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
-        base.Marshal2(wireFormat, o, dataOut, bs);
+    public override void TightMarshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
+        base.TightMarshal2(wireFormat, o, dataOut, bs);
 
         IntegerResponse info = (IntegerResponse)o;
-    DataStreamMarshaller.WriteInt(info.Result, dataOut);
+    BaseDataStreamMarshaller.WriteInt(info.Result, dataOut);
 
     }
   }

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/JournalQueueAckMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/JournalQueueAckMarshaller.cs?rev=381926&r1=381925&r2=381926&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/JournalQueueAckMarshaller.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/JournalQueueAckMarshaller.cs Tue Feb 28 22:29:45 2006
@@ -34,7 +34,7 @@
   //        if you need to make a change, please see the Groovy scripts in the
   //        activemq-core module
   //
-  public class JournalQueueAckMarshaller : DataStreamMarshaller
+  public class JournalQueueAckMarshaller : BaseDataStreamMarshaller
   {
 
 
@@ -51,13 +51,13 @@
     // 
     // Un-marshal an object instance from the data input stream
     // 
-    public override void Unmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
+    public override void TightUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
     {
-        base.Unmarshal(wireFormat, o, dataIn, bs);
+        base.TightUnmarshal(wireFormat, o, dataIn, bs);
 
         JournalQueueAck info = (JournalQueueAck)o;
-        info.Destination = (ActiveMQDestination) UnmarshalNestedObject(wireFormat, dataIn, bs);
-        info.MessageAck = (MessageAck) UnmarshalNestedObject(wireFormat, dataIn, bs);
+        info.Destination = (ActiveMQDestination) TightUnmarshalNestedObject(wireFormat, dataIn, bs);
+        info.MessageAck = (MessageAck) TightUnmarshalNestedObject(wireFormat, dataIn, bs);
 
     }
 
@@ -65,12 +65,12 @@
     //
     // Write the booleans that this object uses to a BooleanStream
     //
-    public override int Marshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
+    public override int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
         JournalQueueAck info = (JournalQueueAck)o;
 
-        int rc = base.Marshal1(wireFormat, info, bs);
-    rc += Marshal1NestedObject(wireFormat, info.Destination, bs);
-    rc += Marshal1NestedObject(wireFormat, info.MessageAck, bs);
+        int rc = base.TightMarshal1(wireFormat, info, bs);
+    rc += TightMarshalNestedObject1(wireFormat, info.Destination, bs);
+    rc += TightMarshalNestedObject1(wireFormat, info.MessageAck, bs);
 
         return rc + 0;
     }
@@ -78,12 +78,12 @@
     // 
     // Write a object instance to data output stream
     //
-    public override void Marshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
-        base.Marshal2(wireFormat, o, dataOut, bs);
+    public override void TightMarshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
+        base.TightMarshal2(wireFormat, o, dataOut, bs);
 
         JournalQueueAck info = (JournalQueueAck)o;
-    Marshal2NestedObject(wireFormat, info.Destination, dataOut, bs);
-    Marshal2NestedObject(wireFormat, info.MessageAck, dataOut, bs);
+    TightMarshalNestedObject2(wireFormat, info.Destination, dataOut, bs);
+    TightMarshalNestedObject2(wireFormat, info.MessageAck, dataOut, bs);
 
     }
   }

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/JournalTopicAckMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/JournalTopicAckMarshaller.cs?rev=381926&r1=381925&r2=381926&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/JournalTopicAckMarshaller.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/JournalTopicAckMarshaller.cs Tue Feb 28 22:29:45 2006
@@ -34,7 +34,7 @@
   //        if you need to make a change, please see the Groovy scripts in the
   //        activemq-core module
   //
-  public class JournalTopicAckMarshaller : DataStreamMarshaller
+  public class JournalTopicAckMarshaller : BaseDataStreamMarshaller
   {
 
 
@@ -51,17 +51,17 @@
     // 
     // Un-marshal an object instance from the data input stream
     // 
-    public override void Unmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
+    public override void TightUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
     {
-        base.Unmarshal(wireFormat, o, dataIn, bs);
+        base.TightUnmarshal(wireFormat, o, dataIn, bs);
 
         JournalTopicAck info = (JournalTopicAck)o;
-        info.Destination = (ActiveMQDestination) UnmarshalNestedObject(wireFormat, dataIn, bs);
-        info.MessageId = (MessageId) UnmarshalNestedObject(wireFormat, dataIn, bs);
-        info.MessageSequenceId = UnmarshalLong(wireFormat, dataIn, bs);
-        info.SubscritionName = ReadString(dataIn, bs);
-        info.ClientId = ReadString(dataIn, bs);
-        info.TransactionId = (TransactionId) UnmarshalNestedObject(wireFormat, dataIn, bs);
+        info.Destination = (ActiveMQDestination) TightUnmarshalNestedObject(wireFormat, dataIn, bs);
+        info.MessageId = (MessageId) TightUnmarshalNestedObject(wireFormat, dataIn, bs);
+        info.MessageSequenceId = TightUnmarshalLong(wireFormat, dataIn, bs);
+        info.SubscritionName = TightUnmarshalString(dataIn, bs);
+        info.ClientId = TightUnmarshalString(dataIn, bs);
+        info.TransactionId = (TransactionId) TightUnmarshalNestedObject(wireFormat, dataIn, bs);
 
     }
 
@@ -69,16 +69,16 @@
     //
     // Write the booleans that this object uses to a BooleanStream
     //
-    public override int Marshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
+    public override int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
         JournalTopicAck info = (JournalTopicAck)o;
 
-        int rc = base.Marshal1(wireFormat, info, bs);
-    rc += Marshal1NestedObject(wireFormat, info.Destination, bs);
-    rc += Marshal1NestedObject(wireFormat, info.MessageId, bs);
-    rc += Marshal1Long(wireFormat, info.MessageSequenceId, bs);
-    rc += WriteString(info.SubscritionName, bs);
-    rc += WriteString(info.ClientId, bs);
-    rc += Marshal1NestedObject(wireFormat, info.TransactionId, bs);
+        int rc = base.TightMarshal1(wireFormat, info, bs);
+    rc += TightMarshalNestedObject1(wireFormat, info.Destination, bs);
+    rc += TightMarshalNestedObject1(wireFormat, info.MessageId, bs);
+    rc += TightMarshalLong1(wireFormat, info.MessageSequenceId, bs);
+    rc += TightMarshalString1(info.SubscritionName, bs);
+    rc += TightMarshalString1(info.ClientId, bs);
+    rc += TightMarshalNestedObject1(wireFormat, info.TransactionId, bs);
 
         return rc + 0;
     }
@@ -86,16 +86,16 @@
     // 
     // Write a object instance to data output stream
     //
-    public override void Marshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
-        base.Marshal2(wireFormat, o, dataOut, bs);
+    public override void TightMarshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
+        base.TightMarshal2(wireFormat, o, dataOut, bs);
 
         JournalTopicAck info = (JournalTopicAck)o;
-    Marshal2NestedObject(wireFormat, info.Destination, dataOut, bs);
-    Marshal2NestedObject(wireFormat, info.MessageId, dataOut, bs);
-    Marshal2Long(wireFormat, info.MessageSequenceId, dataOut, bs);
-    WriteString(info.SubscritionName, dataOut, bs);
-    WriteString(info.ClientId, dataOut, bs);
-    Marshal2NestedObject(wireFormat, info.TransactionId, dataOut, bs);
+    TightMarshalNestedObject2(wireFormat, info.Destination, dataOut, bs);
+    TightMarshalNestedObject2(wireFormat, info.MessageId, dataOut, bs);
+    TightMarshalLong2(wireFormat, info.MessageSequenceId, dataOut, bs);
+    TightMarshalString2(info.SubscritionName, dataOut, bs);
+    TightMarshalString2(info.ClientId, dataOut, bs);
+    TightMarshalNestedObject2(wireFormat, info.TransactionId, dataOut, bs);
 
     }
   }

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/JournalTraceMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/JournalTraceMarshaller.cs?rev=381926&r1=381925&r2=381926&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/JournalTraceMarshaller.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/JournalTraceMarshaller.cs Tue Feb 28 22:29:45 2006
@@ -34,7 +34,7 @@
   //        if you need to make a change, please see the Groovy scripts in the
   //        activemq-core module
   //
-  public class JournalTraceMarshaller : DataStreamMarshaller
+  public class JournalTraceMarshaller : BaseDataStreamMarshaller
   {
 
 
@@ -51,12 +51,12 @@
     // 
     // Un-marshal an object instance from the data input stream
     // 
-    public override void Unmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
+    public override void TightUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
     {
-        base.Unmarshal(wireFormat, o, dataIn, bs);
+        base.TightUnmarshal(wireFormat, o, dataIn, bs);
 
         JournalTrace info = (JournalTrace)o;
-        info.Message = ReadString(dataIn, bs);
+        info.Message = TightUnmarshalString(dataIn, bs);
 
     }
 
@@ -64,11 +64,11 @@
     //
     // Write the booleans that this object uses to a BooleanStream
     //
-    public override int Marshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
+    public override int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
         JournalTrace info = (JournalTrace)o;
 
-        int rc = base.Marshal1(wireFormat, info, bs);
-    rc += WriteString(info.Message, bs);
+        int rc = base.TightMarshal1(wireFormat, info, bs);
+    rc += TightMarshalString1(info.Message, bs);
 
         return rc + 0;
     }
@@ -76,11 +76,11 @@
     // 
     // Write a object instance to data output stream
     //
-    public override void Marshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
-        base.Marshal2(wireFormat, o, dataOut, bs);
+    public override void TightMarshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
+        base.TightMarshal2(wireFormat, o, dataOut, bs);
 
         JournalTrace info = (JournalTrace)o;
-    WriteString(info.Message, dataOut, bs);
+    TightMarshalString2(info.Message, dataOut, bs);
 
     }
   }

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/JournalTransactionMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/JournalTransactionMarshaller.cs?rev=381926&r1=381925&r2=381926&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/JournalTransactionMarshaller.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/JournalTransactionMarshaller.cs Tue Feb 28 22:29:45 2006
@@ -34,7 +34,7 @@
   //        if you need to make a change, please see the Groovy scripts in the
   //        activemq-core module
   //
-  public class JournalTransactionMarshaller : DataStreamMarshaller
+  public class JournalTransactionMarshaller : BaseDataStreamMarshaller
   {
 
 
@@ -51,13 +51,13 @@
     // 
     // Un-marshal an object instance from the data input stream
     // 
-    public override void Unmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
+    public override void TightUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
     {
-        base.Unmarshal(wireFormat, o, dataIn, bs);
+        base.TightUnmarshal(wireFormat, o, dataIn, bs);
 
         JournalTransaction info = (JournalTransaction)o;
-        info.TransactionId = (TransactionId) UnmarshalNestedObject(wireFormat, dataIn, bs);
-        info.Type = DataStreamMarshaller.ReadByte(dataIn);
+        info.TransactionId = (TransactionId) TightUnmarshalNestedObject(wireFormat, dataIn, bs);
+        info.Type = BaseDataStreamMarshaller.ReadByte(dataIn);
         info.WasPrepared = bs.ReadBoolean();
 
     }
@@ -66,11 +66,11 @@
     //
     // Write the booleans that this object uses to a BooleanStream
     //
-    public override int Marshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
+    public override int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
         JournalTransaction info = (JournalTransaction)o;
 
-        int rc = base.Marshal1(wireFormat, info, bs);
-    rc += Marshal1NestedObject(wireFormat, info.TransactionId, bs);
+        int rc = base.TightMarshal1(wireFormat, info, bs);
+    rc += TightMarshalNestedObject1(wireFormat, info.TransactionId, bs);
         bs.WriteBoolean(info.WasPrepared);
 
         return rc + 1;
@@ -79,12 +79,12 @@
     // 
     // Write a object instance to data output stream
     //
-    public override void Marshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
-        base.Marshal2(wireFormat, o, dataOut, bs);
+    public override void TightMarshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
+        base.TightMarshal2(wireFormat, o, dataOut, bs);
 
         JournalTransaction info = (JournalTransaction)o;
-    Marshal2NestedObject(wireFormat, info.TransactionId, dataOut, bs);
-    DataStreamMarshaller.WriteByte(info.Type, dataOut);
+    TightMarshalNestedObject2(wireFormat, info.TransactionId, dataOut, bs);
+    BaseDataStreamMarshaller.WriteByte(info.Type, dataOut);
     bs.ReadBoolean();
 
     }

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/KeepAliveInfoMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/KeepAliveInfoMarshaller.cs?rev=381926&r1=381925&r2=381926&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/KeepAliveInfoMarshaller.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/KeepAliveInfoMarshaller.cs Tue Feb 28 22:29:45 2006
@@ -34,7 +34,7 @@
   //        if you need to make a change, please see the Groovy scripts in the
   //        activemq-core module
   //
-  public class KeepAliveInfoMarshaller : DataStreamMarshaller
+  public class KeepAliveInfoMarshaller : BaseDataStreamMarshaller
   {
 
 
@@ -51,9 +51,9 @@
     // 
     // Un-marshal an object instance from the data input stream
     // 
-    public override void Unmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
+    public override void TightUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
     {
-        base.Unmarshal(wireFormat, o, dataIn, bs);
+        base.TightUnmarshal(wireFormat, o, dataIn, bs);
 
     }
 
@@ -61,10 +61,10 @@
     //
     // Write the booleans that this object uses to a BooleanStream
     //
-    public override int Marshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
+    public override int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
         KeepAliveInfo info = (KeepAliveInfo)o;
 
-        int rc = base.Marshal1(wireFormat, info, bs);
+        int rc = base.TightMarshal1(wireFormat, info, bs);
 
         return rc + 0;
     }
@@ -72,8 +72,8 @@
     // 
     // Write a object instance to data output stream
     //
-    public override void Marshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
-        base.Marshal2(wireFormat, o, dataOut, bs);
+    public override void TightMarshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
+        base.TightMarshal2(wireFormat, o, dataOut, bs);
 
     }
   }

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/LocalTransactionIdMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/LocalTransactionIdMarshaller.cs?rev=381926&r1=381925&r2=381926&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/LocalTransactionIdMarshaller.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/LocalTransactionIdMarshaller.cs Tue Feb 28 22:29:45 2006
@@ -51,13 +51,13 @@
     // 
     // Un-marshal an object instance from the data input stream
     // 
-    public override void Unmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
+    public override void TightUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
     {
-        base.Unmarshal(wireFormat, o, dataIn, bs);
+        base.TightUnmarshal(wireFormat, o, dataIn, bs);
 
         LocalTransactionId info = (LocalTransactionId)o;
-        info.Value = UnmarshalLong(wireFormat, dataIn, bs);
-        info.ConnectionId = (ConnectionId) UnmarshalCachedObject(wireFormat, dataIn, bs);
+        info.Value = TightUnmarshalLong(wireFormat, dataIn, bs);
+        info.ConnectionId = (ConnectionId) TightUnmarshalCachedObject(wireFormat, dataIn, bs);
 
     }
 
@@ -65,12 +65,12 @@
     //
     // Write the booleans that this object uses to a BooleanStream
     //
-    public override int Marshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
+    public override int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
         LocalTransactionId info = (LocalTransactionId)o;
 
-        int rc = base.Marshal1(wireFormat, info, bs);
-    rc += Marshal1Long(wireFormat, info.Value, bs);
-    rc += Marshal1CachedObject(wireFormat, info.ConnectionId, bs);
+        int rc = base.TightMarshal1(wireFormat, info, bs);
+    rc += TightMarshalLong1(wireFormat, info.Value, bs);
+    rc += TightMarshalCachedObject1(wireFormat, info.ConnectionId, bs);
 
         return rc + 0;
     }
@@ -78,12 +78,12 @@
     // 
     // Write a object instance to data output stream
     //
-    public override void Marshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
-        base.Marshal2(wireFormat, o, dataOut, bs);
+    public override void TightMarshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
+        base.TightMarshal2(wireFormat, o, dataOut, bs);
 
         LocalTransactionId info = (LocalTransactionId)o;
-    Marshal2Long(wireFormat, info.Value, dataOut, bs);
-    Marshal2CachedObject(wireFormat, info.ConnectionId, dataOut, bs);
+    TightMarshalLong2(wireFormat, info.Value, dataOut, bs);
+    TightMarshalCachedObject2(wireFormat, info.ConnectionId, dataOut, bs);
 
     }
   }

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/MessageAckMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/MessageAckMarshaller.cs?rev=381926&r1=381925&r2=381926&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/MessageAckMarshaller.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/MessageAckMarshaller.cs Tue Feb 28 22:29:45 2006
@@ -51,18 +51,18 @@
     // 
     // Un-marshal an object instance from the data input stream
     // 
-    public override void Unmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
+    public override void TightUnmarshal(OpenWireFormat wireFormat, Object o, BinaryReader dataIn, BooleanStream bs) 
     {
-        base.Unmarshal(wireFormat, o, dataIn, bs);
+        base.TightUnmarshal(wireFormat, o, dataIn, bs);
 
         MessageAck info = (MessageAck)o;
-        info.Destination = (ActiveMQDestination) UnmarshalCachedObject(wireFormat, dataIn, bs);
-        info.TransactionId = (TransactionId) UnmarshalCachedObject(wireFormat, dataIn, bs);
-        info.ConsumerId = (ConsumerId) UnmarshalCachedObject(wireFormat, dataIn, bs);
-        info.AckType = DataStreamMarshaller.ReadByte(dataIn);
-        info.FirstMessageId = (MessageId) UnmarshalNestedObject(wireFormat, dataIn, bs);
-        info.LastMessageId = (MessageId) UnmarshalNestedObject(wireFormat, dataIn, bs);
-        info.MessageCount = DataStreamMarshaller.ReadInt(dataIn);
+        info.Destination = (ActiveMQDestination) TightUnmarshalCachedObject(wireFormat, dataIn, bs);
+        info.TransactionId = (TransactionId) TightUnmarshalCachedObject(wireFormat, dataIn, bs);
+        info.ConsumerId = (ConsumerId) TightUnmarshalCachedObject(wireFormat, dataIn, bs);
+        info.AckType = BaseDataStreamMarshaller.ReadByte(dataIn);
+        info.FirstMessageId = (MessageId) TightUnmarshalNestedObject(wireFormat, dataIn, bs);
+        info.LastMessageId = (MessageId) TightUnmarshalNestedObject(wireFormat, dataIn, bs);
+        info.MessageCount = BaseDataStreamMarshaller.ReadInt(dataIn);
 
     }
 
@@ -70,33 +70,33 @@
     //
     // Write the booleans that this object uses to a BooleanStream
     //
-    public override int Marshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
+    public override int TightMarshal1(OpenWireFormat wireFormat, Object o, BooleanStream bs) {
         MessageAck info = (MessageAck)o;
 
-        int rc = base.Marshal1(wireFormat, info, bs);
-    rc += Marshal1CachedObject(wireFormat, info.Destination, bs);
-    rc += Marshal1CachedObject(wireFormat, info.TransactionId, bs);
-    rc += Marshal1CachedObject(wireFormat, info.ConsumerId, bs);
-        rc += Marshal1NestedObject(wireFormat, info.FirstMessageId, bs);
-    rc += Marshal1NestedObject(wireFormat, info.LastMessageId, bs);
+        int rc = base.TightMarshal1(wireFormat, info, bs);
+    rc += TightMarshalCachedObject1(wireFormat, info.Destination, bs);
+    rc += TightMarshalCachedObject1(wireFormat, info.TransactionId, bs);
+    rc += TightMarshalCachedObject1(wireFormat, info.ConsumerId, bs);
+        rc += TightMarshalNestedObject1(wireFormat, info.FirstMessageId, bs);
+    rc += TightMarshalNestedObject1(wireFormat, info.LastMessageId, bs);
     
-        return rc + 2;
+        return rc + 5;
     }
 
     // 
     // Write a object instance to data output stream
     //
-    public override void Marshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
-        base.Marshal2(wireFormat, o, dataOut, bs);
+    public override void TightMarshal2(OpenWireFormat wireFormat, Object o, BinaryWriter dataOut, BooleanStream bs) {
+        base.TightMarshal2(wireFormat, o, dataOut, bs);
 
         MessageAck info = (MessageAck)o;
-    Marshal2CachedObject(wireFormat, info.Destination, dataOut, bs);
-    Marshal2CachedObject(wireFormat, info.TransactionId, dataOut, bs);
-    Marshal2CachedObject(wireFormat, info.ConsumerId, dataOut, bs);
-    DataStreamMarshaller.WriteByte(info.AckType, dataOut);
-    Marshal2NestedObject(wireFormat, info.FirstMessageId, dataOut, bs);
-    Marshal2NestedObject(wireFormat, info.LastMessageId, dataOut, bs);
-    DataStreamMarshaller.WriteInt(info.MessageCount, dataOut);
+    TightMarshalCachedObject2(wireFormat, info.Destination, dataOut, bs);
+    TightMarshalCachedObject2(wireFormat, info.TransactionId, dataOut, bs);
+    TightMarshalCachedObject2(wireFormat, info.ConsumerId, dataOut, bs);
+    BaseDataStreamMarshaller.WriteByte(info.AckType, dataOut);
+    TightMarshalNestedObject2(wireFormat, info.FirstMessageId, dataOut, bs);
+    TightMarshalNestedObject2(wireFormat, info.LastMessageId, dataOut, bs);
+    BaseDataStreamMarshaller.WriteInt(info.MessageCount, dataOut);
 
     }
   }



Mime
View raw message