activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jstrac...@apache.org
Subject svn commit: r381643 [1/2] - in /incubator/activemq/trunk/openwire-dotnet: src/OpenWire.Client/ src/OpenWire.Client/Core/ src/OpenWire.Client/IO/ tests/OpenWire.Client/
Date Tue, 28 Feb 2006 12:36:29 GMT
Author: jstrachan
Date: Tue Feb 28 04:36:22 2006
New Revision: 381643

URL: http://svn.apache.org/viewcvs?rev=381643&view=rev
Log:
added support for transactions together with support for consumer.Receive(timeout)

Added:
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/Core/ISynchronization.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/Core/TransactionContext.cs
    incubator/activemq/trunk/openwire-dotnet/tests/OpenWire.Client/TransactionTest.cs
Modified:
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/Connection.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/Core/Dispatcher.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IConnection.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IMessageConsumer.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/ActiveMQDestinationMarshaller.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/BaseCommandMarshaller.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/BrokerIdMarshaller.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/BrokerInfoMarshaller.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/ConnectionErrorMarshaller.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/ConnectionIdMarshaller.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/ConnectionInfoMarshaller.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/ConsumerIdMarshaller.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/ConsumerInfoMarshaller.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/ControlCommandMarshaller.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/DataArrayResponseMarshaller.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/DataResponseMarshaller.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/DestinationInfoMarshaller.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/DiscoveryEventMarshaller.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/ExceptionResponseMarshaller.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/IntegerResponseMarshaller.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/JournalQueueAckMarshaller.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/JournalTopicAckMarshaller.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/JournalTraceMarshaller.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/JournalTransactionMarshaller.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/LocalTransactionIdMarshaller.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/MessageAckMarshaller.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/MessageDispatchMarshaller.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/MessageDispatchNotificationMarshaller.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/MessageIdMarshaller.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/MessageMarshaller.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/ProducerIdMarshaller.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/ProducerInfoMarshaller.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/RemoveInfoMarshaller.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/RemoveSubscriptionInfoMarshaller.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/ResponseMarshaller.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/SessionIdMarshaller.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/SessionInfoMarshaller.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/SubscriptionInfoMarshaller.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/TransactionInfoMarshaller.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/WireFormatInfoMarshaller.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/XATransactionIdMarshaller.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/ISession.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/MessageConsumer.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/MessageProducer.cs
    incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/Session.cs
    incubator/activemq/trunk/openwire-dotnet/tests/OpenWire.Client/ConsumerTest.cs
    incubator/activemq/trunk/openwire-dotnet/tests/OpenWire.Client/TestSupport.cs

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/Connection.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/Connection.cs?rev=381643&r1=381642&r2=381643&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/Connection.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/Connection.cs Tue Feb 28 04:36:22 2006
@@ -13,16 +13,16 @@
     {
         private ITransport transport;
         private ConnectionInfo info;
+        private AcknowledgementMode acknowledgementMode = AcknowledgementMode.AutoAcknowledge;
         private BrokerInfo brokerInfo; // from broker
         private WireFormatInfo brokerWireFormatInfo; // from broker
         private IList sessions = new ArrayList();
-        private bool transacted;
+        private IDictionary consumers = new Hashtable(); // TODO threadsafe
         private bool connected;
         private bool closed;
-        private AcknowledgementMode acknowledgementMode = AcknowledgementMode.AutoAcknowledge;
         private long sessionCounter;
         private long temporaryDestinationCounter;
-        private IDictionary consumers = new Hashtable(); // TODO threadsafe
+        private long localTransactionCounter;
         
         
         public Connection(ITransport transport, ConnectionInfo info)
@@ -32,7 +32,7 @@
             this.transport.Command += new CommandHandler(OnCommand);
             this.transport.Start();
         }
- 
+        
         /// <summary>
         /// Starts message delivery for this connection.
         /// </summary>
@@ -53,16 +53,15 @@
         /// </summary>
         public ISession CreateSession()
         {
-            return CreateSession(transacted, acknowledgementMode);
+            return CreateSession(acknowledgementMode);
         }
         
         /// <summary>
         /// Creates a new session to work on this connection
         /// </summary>
-        public ISession CreateSession(bool transacted, AcknowledgementMode acknowledgementMode)
+        public ISession CreateSession(AcknowledgementMode acknowledgementMode)
         {
-            CheckConnected();
-            SessionInfo info = CreateSessionInfo(transacted, acknowledgementMode);
+            SessionInfo info = CreateSessionInfo(acknowledgementMode);
             SyncRequest(info);
             Session session = new Session(this, info, acknowledgementMode);
             sessions.Add(session);
@@ -71,10 +70,13 @@
         
         public void Dispose()
         {
+            /*
             foreach (Session session in sessions)
             {
                 session.Dispose();
             }
+            */
+            DisposeOf(ConnectionId);
             sessions.Clear();
             transport.Dispose();
             closed = true;
@@ -88,11 +90,6 @@
             set { this.transport = value; }
         }
         
-        public bool Transacted
-        {
-            get { return transacted; }
-            set { this.transacted = value; }
-        }
         
         public AcknowledgementMode AcknowledgementMode
         {
@@ -112,13 +109,22 @@
             }
         }
         
-        public BrokerInfo BrokerInfo {
+        public ConnectionId ConnectionId
+        {
+            get {
+                return info.ConnectionId;
+            }
+        }
+        
+        public BrokerInfo BrokerInfo
+        {
             get {
                 return brokerInfo;
             }
         }
         
-        public WireFormatInfo BrokerWireFormat {
+        public WireFormatInfo BrokerWireFormat
+        {
             get {
                 return brokerWireFormatInfo;
             }
@@ -131,6 +137,7 @@
         /// </summary>
         public Response SyncRequest(Command command)
         {
+            CheckConnected();
             Response response = transport.Request(command);
             if (response is ExceptionResponse)
             {
@@ -141,18 +148,17 @@
             return response;
         }
         
+        public void OneWay(Command command)
+        {
+            CheckConnected();
+            transport.Oneway(command);
+        }
         
-        protected SessionInfo CreateSessionInfo(bool transacted, AcknowledgementMode acknowledgementMode)
+        public void DisposeOf(DataStructure objectId)
         {
-            SessionInfo answer = new SessionInfo();
-            SessionId sessionId = new SessionId();
-            sessionId.ConnectionId = info.ConnectionId.Value;
-            lock (this)
-            {
-                sessionId.Value = ++sessionCounter;
-            }
-            answer.SessionId = sessionId;
-            return answer;
+            RemoveInfo command = new RemoveInfo();
+            command.ObjectId = objectId;
+            SyncRequest(command);
         }
         
         
@@ -167,6 +173,20 @@
             }
         }
         
+        /// <summary>
+        /// Creates a new local transaction ID
+        /// </summary>
+        public LocalTransactionId CreateLocalTransactionId()
+        {
+            LocalTransactionId id= new LocalTransactionId();
+            id.ConnectionId = ConnectionId;
+            lock (this)
+            {
+                id.Value = (++localTransactionCounter);
+            }
+            return id;
+        }
+        
         protected void CheckConnected()
         {
             if (closed)
@@ -175,9 +195,9 @@
             }
             if (!connected)
             {
+                connected = true;
                 // now lets send the connection and see if we get an ack/nak
                 SyncRequest(info);
-                connected = true;
             }
         }
         
@@ -224,10 +244,12 @@
                     consumer.Dispatch(message);
                 }
             }
-            else if (command is WireFormatInfo) {
+            else if (command is WireFormatInfo)
+            {
                 this.brokerWireFormatInfo = (WireFormatInfo) command;
             }
-            else if (command is BrokerInfo) {
+            else if (command is BrokerInfo)
+            {
                 this.brokerInfo = (BrokerInfo) command;
             }
             else
@@ -235,6 +257,19 @@
                 Console.WriteLine("ERROR:ĂŠUnknown command: " + command);
             }
         }
-
+        
+        protected SessionInfo CreateSessionInfo(AcknowledgementMode acknowledgementMode)
+        {
+            SessionInfo answer = new SessionInfo();
+            SessionId sessionId = new SessionId();
+            sessionId.ConnectionId = info.ConnectionId.Value;
+            lock (this)
+            {
+                sessionId.Value = ++sessionCounter;
+            }
+            answer.SessionId = sessionId;
+            return answer;
+        }
+        
     }
 }

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/Core/Dispatcher.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/Core/Dispatcher.cs?rev=381643&r1=381642&r2=381643&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/Core/Dispatcher.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/Core/Dispatcher.cs Tue Feb 28 04:36:22 2006
@@ -18,6 +18,7 @@
 using OpenWire.Client.Commands;
 using System;
 using OpenWire.Client;
+using System.Threading;
 
 namespace OpenWire.Client.Core
 {
@@ -26,14 +27,52 @@
     /// </summary>
     public class Dispatcher
     {
-        Queue queue = Queue.Synchronized( new Queue() );
+        Queue queue = new Queue();
+        Object semaphore = new Object();
+        ArrayList messagesToRedeliver = new ArrayList();
 
         /// <summary>
+        /// Whem we start a transaction we must redeliver any rolled back messages
+        /// </summary>
+        public void RedeliverRolledBackMessages() {
+            lock (semaphore)
+            {
+                Queue replacement = new Queue(queue.Count + messagesToRedeliver.Count);
+                foreach (ActiveMQMessage element in messagesToRedeliver) {
+                    replacement.Enqueue(element);
+                }
+                messagesToRedeliver.Clear();
+                
+                while (queue.Count > 0)
+                {
+                    ActiveMQMessage element = (ActiveMQMessage) queue.Dequeue();
+                    replacement.Enqueue(element);
+                }
+                queue = replacement;
+                Monitor.PulseAll(semaphore);
+            }
+        }
+        
+        /// <summary>
+        /// Redeliver the given message, putting it at the head of the queue
+        /// </summary>
+        public void Redeliver(ActiveMQMessage message)
+        {
+            lock (semaphore) {
+            messagesToRedeliver.Add(message);
+            }
+        }
+        
+        /// <summary>
         /// Method Enqueue
         /// </summary>
         public void Enqueue(ActiveMQMessage message)
         {
-            queue.Enqueue(message);
+            lock (semaphore)
+            {
+                queue.Enqueue(message);
+                Monitor.PulseAll(semaphore);
+            }
         }
         
         /// <summary>
@@ -41,9 +80,9 @@
         /// </summary>
         public IMessage DequeueNoWait()
         {
-            lock (queue)
+            lock (semaphore)
             {
-                if (queue.Peek() != null)
+                if (queue.Count > 0)
                 {
                     return (IMessage) queue.Dequeue();
                 }
@@ -54,10 +93,20 @@
         /// <summary>
         /// Method Dequeue
         /// </summary>
-        public IMessage Dequeue(long timeout)
+        public IMessage Dequeue(int timeout)
         {
-            // TODO
-            throw new Exception("Not implemented yet");
+            lock (semaphore)
+            {
+                if (queue.Count == 0)
+                {
+                    Monitor.Wait(semaphore, timeout);
+                }
+                if (queue.Count > 0)
+                {
+                    return (IMessage) queue.Dequeue();
+                }
+            }
+            return null;
         }
         
         /// <summary>
@@ -65,7 +114,10 @@
         /// </summary>
         public IMessage Dequeue()
         {
-            return (IMessage) queue.Dequeue();
+            lock (semaphore)
+            {
+                return (IMessage) queue.Dequeue();
+            }
         }
         
     }

Added: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/Core/ISynchronization.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/Core/ISynchronization.cs?rev=381643&view=auto
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/Core/ISynchronization.cs (added)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/Core/ISynchronization.cs Tue Feb 28 04:36:22 2006
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2006 The Apache Software Foundation or its licensors, as
+ * applicable.
+ *
+ * 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.
+ */
+namespace OpenWire.Client.Core
+{
+    public interface ISynchronization
+    {
+        /// <summary>
+        /// Called before a commit
+        /// </summary>
+        void BeforeCommit();
+        
+        /// <summary>
+        /// Called after a commit
+        /// </summary>
+        void AfterCommit();
+        
+        /// <summary>
+        /// Called after a transaction rollback
+        /// </summary>
+        void AfterRollback();
+    }
+}

Added: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/Core/TransactionContext.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/Core/TransactionContext.cs?rev=381643&view=auto
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/Core/TransactionContext.cs (added)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/Core/TransactionContext.cs Tue Feb 28 04:36:22 2006
@@ -0,0 +1,110 @@
+/*
+ * Copyright 2006 The Apache Software Foundation or its licensors, as
+ * applicable.
+ *
+ * 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.Collections;
+using OpenWire.Client.Commands;
+using System;
+using OpenWire.Client;
+
+namespace OpenWire.Client.Core
+{
+    public enum TransactionType
+    {
+        Begin = 0, Prepare = 1, CommitOnePhase = 2, CommitTwoPhase = 3, Rollback = 4, Recover=5, Forget = 6, End = 7
+    }
+    
+    public class TransactionContext
+    {
+        private TransactionId transactionId;
+        private Session session;
+        private ArrayList synchronizations = new ArrayList();
+        
+        public TransactionContext(Session session) {
+            this.session = session;
+        }
+        
+        public TransactionId TransactionId
+        {
+            get { return transactionId; }
+        }
+        
+        /// <summary>
+        /// Method AddSynchronization
+        /// </summary>
+        public void AddSynchronization(ISynchronization synchronization)
+        {
+            synchronizations.Add(synchronization);
+        }
+        
+        
+        public void Begin()
+        {
+            if (transactionId == null)
+            {
+                transactionId = session.Connection.CreateLocalTransactionId();
+                
+                TransactionInfo info = new TransactionInfo();
+                info.ConnectionId = session.Connection.ConnectionId;
+                info.TransactionId = transactionId;
+                info.Type = (int) TransactionType.Begin;
+                session.Connection.OneWay(info);
+            }
+        }
+        
+        
+        public void Rollback()
+        {
+            if (transactionId != null)
+            {
+                TransactionInfo info = new TransactionInfo();
+                info.ConnectionId = session.Connection.ConnectionId;
+                info.TransactionId = transactionId;
+                info.Type = (int) TransactionType.Rollback;
+                
+                transactionId = null;
+                session.Connection.OneWay(info);
+            }
+            
+            foreach (ISynchronization synchronization in synchronizations) {
+                synchronization.AfterRollback();
+            }
+            synchronizations.Clear();
+        }
+        
+        public void Commit()
+        {
+            foreach (ISynchronization synchronization in synchronizations) {
+                synchronization.BeforeCommit();
+            }
+            
+            if (transactionId != null)
+            {
+                TransactionInfo info = new TransactionInfo();
+                info.ConnectionId = session.Connection.ConnectionId;
+                info.TransactionId = transactionId;
+                info.Type = (int) TransactionType.CommitOnePhase;
+                
+                transactionId = null;
+                session.Connection.OneWay(info);
+            }
+            
+            foreach (ISynchronization synchronization in synchronizations) {
+                synchronization.AfterCommit();
+            }
+            synchronizations.Clear();
+        }
+    }
+}

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IConnection.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IConnection.cs?rev=381643&r1=381642&r2=381643&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IConnection.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IConnection.cs Tue Feb 28 04:36:22 2006
@@ -17,47 +17,46 @@
 using System;
 using OpenWire.Client.Commands;
 
-namespace OpenWire.Client {
-
-        public enum AcknowledgementMode {
-                Unknown, AutoAcknowledge, ClientAcknowledge, Transactional
-        }
-
-
+namespace OpenWire.Client
+{
+    
+    public enum AcknowledgementMode
+    {
+        Unknown, AutoAcknowledge, ClientAcknowledge, Transactional
+    }
+    
+    
+    /// <summary>
+    /// Represents a connection with a message broker
+    /// </summary>
+    public interface IConnection : IDisposable, IStartable
+    {
+        
+        /// <summary>
+        /// Creates a new session to work on this connection
+        /// </summary>
+        ISession CreateSession();
+        
         /// <summary>
-        /// Represents a connection with a message broker
+        /// Creates a new session to work on this connection
         /// </summary>
-        public interface IConnection : IDisposable, IStartable {
-
-                /// <summary>
-                /// Creates a new session to work on this connection
-                /// </summary>
-                ISession CreateSession();
-
-                /// <summary>
-                /// Creates a new session to work on this connection
-                /// </summary>
-                ISession CreateSession(bool transacted, AcknowledgementMode acknowledgementMode);
-
-
-                // Properties
-
-                bool Transacted {
-                        get;
-                        set;
-                }
-
-                AcknowledgementMode AcknowledgementMode {
-                        get;
-                        set;
-                }
-
-                String ClientId
-                {
-                    get;
-                    set;
-                }
- 
-                
+        ISession CreateSession(AcknowledgementMode acknowledgementMode);
+        
+        
+        // Properties
+        
+        AcknowledgementMode AcknowledgementMode
+        {
+            get;
+            set;
+        }
+        
+        String ClientId
+        {
+            get;
+            set;
         }
+        
+        
+    }
 }

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IMessageConsumer.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IMessageConsumer.cs?rev=381643&r1=381642&r2=381643&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IMessageConsumer.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IMessageConsumer.cs Tue Feb 28 04:36:22 2006
@@ -35,7 +35,7 @@
         /// <summary>
         /// If a message is available within the timeout duration it is returned otherwise this method returns null
         /// </summary>
-        IMessage Receive(long timeout);
+        IMessage Receive(int timeout);
         
         /// <summary>
         /// If a message is available immediately it is returned otherwise this method returns null

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/ActiveMQDestinationMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/ActiveMQDestinationMarshaller.cs?rev=381643&r1=381642&r2=381643&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/ActiveMQDestinationMarshaller.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/ActiveMQDestinationMarshaller.cs Tue Feb 28 04:36:22 2006
@@ -57,7 +57,7 @@
         ActiveMQDestination info = (ActiveMQDestination)o;
 
         int rc = base.Marshal1(wireFormat, info, bs);
-        rc += WriteString(info.PhysicalName, bs);
+    rc += WriteString(info.PhysicalName, bs);
 
         return rc + 0;
     }
@@ -69,7 +69,7 @@
         base.Marshal2(wireFormat, o, dataOut, bs);
 
         ActiveMQDestination info = (ActiveMQDestination)o;
-        WriteString(info.PhysicalName, dataOut, bs);
+    WriteString(info.PhysicalName, 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=381643&r1=381642&r2=381643&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 04:36:22 2006
@@ -58,7 +58,7 @@
         BaseCommand info = (BaseCommand)o;
 
         int rc = base.Marshal1(wireFormat, info, bs);
-                bs.WriteBoolean(info.ResponseRequired);
+        bs.WriteBoolean(info.ResponseRequired);
 
         return rc + 1;
     }
@@ -70,8 +70,8 @@
         base.Marshal2(wireFormat, o, dataOut, bs);
 
         BaseCommand info = (BaseCommand)o;
-        DataStreamMarshaller.WriteShort(info.CommandId, dataOut);
-        bs.ReadBoolean();
+    DataStreamMarshaller.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=381643&r1=381642&r2=381643&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 04:36:22 2006
@@ -68,7 +68,7 @@
         BrokerId info = (BrokerId)o;
 
         int rc = base.Marshal1(wireFormat, info, bs);
-        rc += WriteString(info.Value, bs);
+    rc += WriteString(info.Value, bs);
 
         return rc + 0;
     }
@@ -80,7 +80,7 @@
         base.Marshal2(wireFormat, o, dataOut, bs);
 
         BrokerId info = (BrokerId)o;
-        WriteString(info.Value, dataOut, bs);
+    WriteString(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=381643&r1=381642&r2=381643&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 04:36:22 2006
@@ -83,11 +83,11 @@
         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);
-        bs.WriteBoolean(info.SlaveBroker);
+    rc += Marshal1CachedObject(wireFormat, info.BrokerId, bs);
+    rc += WriteString(info.BrokerURL, bs);
+    rc += MarshalObjectArray(wireFormat, info.PeerBrokerInfos, bs);
+    rc += WriteString(info.BrokerName, bs);
+    bs.WriteBoolean(info.SlaveBroker);
 
         return rc + 0;
     }
@@ -99,11 +99,11 @@
         base.Marshal2(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);
-        bs.ReadBoolean();
+    Marshal2CachedObject(wireFormat, info.BrokerId, dataOut, bs);
+    WriteString(info.BrokerURL, dataOut, bs);
+    MarshalObjectArray(wireFormat, info.PeerBrokerInfos, dataOut, bs);
+    WriteString(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=381643&r1=381642&r2=381643&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 04:36:22 2006
@@ -69,8 +69,8 @@
         ConnectionError info = (ConnectionError)o;
 
         int rc = base.Marshal1(wireFormat, info, bs);
-        rc += MarshalBrokerError(wireFormat, info.Exception, bs);
-        rc += Marshal1NestedObject(wireFormat, info.ConnectionId, bs);
+    rc += MarshalBrokerError(wireFormat, info.Exception, bs);
+    rc += Marshal1NestedObject(wireFormat, info.ConnectionId, bs);
 
         return rc + 0;
     }
@@ -82,8 +82,8 @@
         base.Marshal2(wireFormat, o, dataOut, bs);
 
         ConnectionError info = (ConnectionError)o;
-        MarshalBrokerError(wireFormat, info.Exception, dataOut, bs);
-        Marshal2NestedObject(wireFormat, info.ConnectionId, dataOut, bs);
+    MarshalBrokerError(wireFormat, info.Exception, dataOut, bs);
+    Marshal2NestedObject(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=381643&r1=381642&r2=381643&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 04:36:22 2006
@@ -68,7 +68,7 @@
         ConnectionId info = (ConnectionId)o;
 
         int rc = base.Marshal1(wireFormat, info, bs);
-        rc += WriteString(info.Value, bs);
+    rc += WriteString(info.Value, bs);
 
         return rc + 0;
     }
@@ -80,7 +80,7 @@
         base.Marshal2(wireFormat, o, dataOut, bs);
 
         ConnectionId info = (ConnectionId)o;
-        WriteString(info.Value, dataOut, bs);
+    WriteString(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=381643&r1=381642&r2=381643&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 04:36:22 2006
@@ -83,11 +83,11 @@
         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);
+    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);
 
         return rc + 0;
     }
@@ -99,11 +99,11 @@
         base.Marshal2(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);
+    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);
 
     }
   }

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=381643&r1=381642&r2=381643&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 04:36:22 2006
@@ -70,9 +70,9 @@
         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);
+    rc += WriteString(info.ConnectionId, bs);
+    rc += Marshal1Long(wireFormat, info.SessionId, bs);
+    rc += Marshal1Long(wireFormat, info.Value, bs);
 
         return rc + 0;
     }
@@ -84,9 +84,9 @@
         base.Marshal2(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);
+    WriteString(info.ConnectionId, dataOut, bs);
+    Marshal2Long(wireFormat, info.SessionId, dataOut, bs);
+    Marshal2Long(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=381643&r1=381642&r2=381643&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 04:36:22 2006
@@ -91,17 +91,17 @@
         ConsumerInfo info = (ConsumerInfo)o;
 
         int rc = base.Marshal1(wireFormat, info, bs);
-        rc += Marshal1CachedObject(wireFormat, info.ConsumerId, bs);
-        bs.WriteBoolean(info.Browser);
-        rc += Marshal1CachedObject(wireFormat, info.Destination, bs);
-                bs.WriteBoolean(info.DispatchAsync);
-        rc += WriteString(info.Selector, bs);
-        rc += WriteString(info.SubcriptionName, bs);
-        bs.WriteBoolean(info.NoLocal);
-        bs.WriteBoolean(info.Exclusive);
-        bs.WriteBoolean(info.Retroactive);
-                rc += MarshalObjectArray(wireFormat, info.BrokerPath, bs);
-        bs.WriteBoolean(info.NetworkSubscription);
+    rc += Marshal1CachedObject(wireFormat, info.ConsumerId, bs);
+    bs.WriteBoolean(info.Browser);
+    rc += Marshal1CachedObject(wireFormat, info.Destination, bs);
+        bs.WriteBoolean(info.DispatchAsync);
+    rc += WriteString(info.Selector, bs);
+    rc += WriteString(info.SubcriptionName, bs);
+    bs.WriteBoolean(info.NoLocal);
+    bs.WriteBoolean(info.Exclusive);
+    bs.WriteBoolean(info.Retroactive);
+        rc += MarshalObjectArray(wireFormat, info.BrokerPath, bs);
+    bs.WriteBoolean(info.NetworkSubscription);
 
         return rc + 2;
     }
@@ -113,19 +113,19 @@
         base.Marshal2(wireFormat, o, dataOut, bs);
 
         ConsumerInfo info = (ConsumerInfo)o;
-        Marshal2CachedObject(wireFormat, info.ConsumerId, dataOut, bs);
-        bs.ReadBoolean();
-        Marshal2CachedObject(wireFormat, info.Destination, dataOut, bs);
-        DataStreamMarshaller.WriteInt(info.PrefetchSize, dataOut);
-        bs.ReadBoolean();
-        WriteString(info.Selector, dataOut, bs);
-        WriteString(info.SubcriptionName, dataOut, bs);
-        bs.ReadBoolean();
-        bs.ReadBoolean();
-        bs.ReadBoolean();
-        DataStreamMarshaller.WriteByte(info.Priority, dataOut);
-        MarshalObjectArray(wireFormat, info.BrokerPath, dataOut, bs);
-        bs.ReadBoolean();
+    Marshal2CachedObject(wireFormat, info.ConsumerId, dataOut, bs);
+    bs.ReadBoolean();
+    Marshal2CachedObject(wireFormat, info.Destination, dataOut, bs);
+    DataStreamMarshaller.WriteInt(info.PrefetchSize, dataOut);
+    bs.ReadBoolean();
+    WriteString(info.Selector, dataOut, bs);
+    WriteString(info.SubcriptionName, dataOut, bs);
+    bs.ReadBoolean();
+    bs.ReadBoolean();
+    bs.ReadBoolean();
+    DataStreamMarshaller.WriteByte(info.Priority, dataOut);
+    MarshalObjectArray(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=381643&r1=381642&r2=381643&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 04:36:22 2006
@@ -68,7 +68,7 @@
         ControlCommand info = (ControlCommand)o;
 
         int rc = base.Marshal1(wireFormat, info, bs);
-        rc += WriteString(info.Command, bs);
+    rc += WriteString(info.Command, bs);
 
         return rc + 0;
     }
@@ -80,7 +80,7 @@
         base.Marshal2(wireFormat, o, dataOut, bs);
 
         ControlCommand info = (ControlCommand)o;
-        WriteString(info.Command, dataOut, bs);
+    WriteString(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=381643&r1=381642&r2=381643&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 04:36:22 2006
@@ -79,7 +79,7 @@
         DataArrayResponse info = (DataArrayResponse)o;
 
         int rc = base.Marshal1(wireFormat, info, bs);
-        rc += MarshalObjectArray(wireFormat, info.Data, bs);
+    rc += MarshalObjectArray(wireFormat, info.Data, bs);
 
         return rc + 0;
     }
@@ -91,7 +91,7 @@
         base.Marshal2(wireFormat, o, dataOut, bs);
 
         DataArrayResponse info = (DataArrayResponse)o;
-        MarshalObjectArray(wireFormat, info.Data, dataOut, bs);
+    MarshalObjectArray(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=381643&r1=381642&r2=381643&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 04:36:22 2006
@@ -68,7 +68,7 @@
         DataResponse info = (DataResponse)o;
 
         int rc = base.Marshal1(wireFormat, info, bs);
-        rc += Marshal1NestedObject(wireFormat, info.Data, bs);
+    rc += Marshal1NestedObject(wireFormat, info.Data, bs);
 
         return rc + 0;
     }
@@ -80,7 +80,7 @@
         base.Marshal2(wireFormat, o, dataOut, bs);
 
         DataResponse info = (DataResponse)o;
-        Marshal2NestedObject(wireFormat, info.Data, dataOut, bs);
+    Marshal2NestedObject(wireFormat, info.Data, 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=381643&r1=381642&r2=381643&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 04:36:22 2006
@@ -83,10 +83,10 @@
         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);
+    rc += Marshal1CachedObject(wireFormat, info.ConnectionId, bs);
+    rc += Marshal1CachedObject(wireFormat, info.Destination, bs);
+        rc += Marshal1Long(wireFormat, info.Timeout, bs);
+    rc += MarshalObjectArray(wireFormat, info.BrokerPath, bs);
 
         return rc + 1;
     }
@@ -98,11 +98,11 @@
         base.Marshal2(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);
+    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);
 
     }
   }

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=381643&r1=381642&r2=381643&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 04:36:22 2006
@@ -69,8 +69,8 @@
         DiscoveryEvent info = (DiscoveryEvent)o;
 
         int rc = base.Marshal1(wireFormat, info, bs);
-        rc += WriteString(info.ServiceName, bs);
-        rc += WriteString(info.BrokerName, bs);
+    rc += WriteString(info.ServiceName, bs);
+    rc += WriteString(info.BrokerName, bs);
 
         return rc + 0;
     }
@@ -82,8 +82,8 @@
         base.Marshal2(wireFormat, o, dataOut, bs);
 
         DiscoveryEvent info = (DiscoveryEvent)o;
-        WriteString(info.ServiceName, dataOut, bs);
-        WriteString(info.BrokerName, dataOut, bs);
+    WriteString(info.ServiceName, dataOut, bs);
+    WriteString(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=381643&r1=381642&r2=381643&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 04:36:22 2006
@@ -68,7 +68,7 @@
         ExceptionResponse info = (ExceptionResponse)o;
 
         int rc = base.Marshal1(wireFormat, info, bs);
-        rc += MarshalBrokerError(wireFormat, info.Exception, bs);
+    rc += MarshalBrokerError(wireFormat, info.Exception, bs);
 
         return rc + 0;
     }
@@ -80,7 +80,7 @@
         base.Marshal2(wireFormat, o, dataOut, bs);
 
         ExceptionResponse info = (ExceptionResponse)o;
-        MarshalBrokerError(wireFormat, info.Exception, dataOut, bs);
+    MarshalBrokerError(wireFormat, info.Exception, 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=381643&r1=381642&r2=381643&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 04:36:22 2006
@@ -68,7 +68,7 @@
         IntegerResponse info = (IntegerResponse)o;
 
         int rc = base.Marshal1(wireFormat, info, bs);
-        
+    
         return rc + 1;
     }
 
@@ -79,7 +79,7 @@
         base.Marshal2(wireFormat, o, dataOut, bs);
 
         IntegerResponse info = (IntegerResponse)o;
-        DataStreamMarshaller.WriteInt(info.Result, dataOut);
+    DataStreamMarshaller.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=381643&r1=381642&r2=381643&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 04:36:22 2006
@@ -69,8 +69,8 @@
         JournalQueueAck info = (JournalQueueAck)o;
 
         int rc = base.Marshal1(wireFormat, info, bs);
-        rc += Marshal1NestedObject(wireFormat, info.Destination, bs);
-        rc += Marshal1NestedObject(wireFormat, info.MessageAck, bs);
+    rc += Marshal1NestedObject(wireFormat, info.Destination, bs);
+    rc += Marshal1NestedObject(wireFormat, info.MessageAck, bs);
 
         return rc + 0;
     }
@@ -82,8 +82,8 @@
         base.Marshal2(wireFormat, o, dataOut, bs);
 
         JournalQueueAck info = (JournalQueueAck)o;
-        Marshal2NestedObject(wireFormat, info.Destination, dataOut, bs);
-        Marshal2NestedObject(wireFormat, info.MessageAck, dataOut, bs);
+    Marshal2NestedObject(wireFormat, info.Destination, dataOut, bs);
+    Marshal2NestedObject(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=381643&r1=381642&r2=381643&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 04:36:22 2006
@@ -73,12 +73,12 @@
         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);
+    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);
 
         return rc + 0;
     }
@@ -90,12 +90,12 @@
         base.Marshal2(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);
+    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);
 
     }
   }

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=381643&r1=381642&r2=381643&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 04:36:22 2006
@@ -68,7 +68,7 @@
         JournalTrace info = (JournalTrace)o;
 
         int rc = base.Marshal1(wireFormat, info, bs);
-        rc += WriteString(info.Message, bs);
+    rc += WriteString(info.Message, bs);
 
         return rc + 0;
     }
@@ -80,7 +80,7 @@
         base.Marshal2(wireFormat, o, dataOut, bs);
 
         JournalTrace info = (JournalTrace)o;
-        WriteString(info.Message, dataOut, bs);
+    WriteString(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=381643&r1=381642&r2=381643&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 04:36:22 2006
@@ -70,8 +70,8 @@
         JournalTransaction info = (JournalTransaction)o;
 
         int rc = base.Marshal1(wireFormat, info, bs);
-        rc += Marshal1NestedObject(wireFormat, info.TransactionId, bs);
-                bs.WriteBoolean(info.WasPrepared);
+    rc += Marshal1NestedObject(wireFormat, info.TransactionId, bs);
+        bs.WriteBoolean(info.WasPrepared);
 
         return rc + 1;
     }
@@ -83,9 +83,9 @@
         base.Marshal2(wireFormat, o, dataOut, bs);
 
         JournalTransaction info = (JournalTransaction)o;
-        Marshal2NestedObject(wireFormat, info.TransactionId, dataOut, bs);
-        DataStreamMarshaller.WriteByte(info.Type, dataOut);
-        bs.ReadBoolean();
+    Marshal2NestedObject(wireFormat, info.TransactionId, dataOut, bs);
+    DataStreamMarshaller.WriteByte(info.Type, dataOut);
+    bs.ReadBoolean();
 
     }
   }

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=381643&r1=381642&r2=381643&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 04:36:22 2006
@@ -69,8 +69,8 @@
         LocalTransactionId info = (LocalTransactionId)o;
 
         int rc = base.Marshal1(wireFormat, info, bs);
-        rc += Marshal1Long(wireFormat, info.Value, bs);
-        rc += Marshal1CachedObject(wireFormat, info.ConnectionId, bs);
+    rc += Marshal1Long(wireFormat, info.Value, bs);
+    rc += Marshal1CachedObject(wireFormat, info.ConnectionId, bs);
 
         return rc + 0;
     }
@@ -82,8 +82,8 @@
         base.Marshal2(wireFormat, o, dataOut, bs);
 
         LocalTransactionId info = (LocalTransactionId)o;
-        Marshal2Long(wireFormat, info.Value, dataOut, bs);
-        Marshal2CachedObject(wireFormat, info.ConnectionId, dataOut, bs);
+    Marshal2Long(wireFormat, info.Value, dataOut, bs);
+    Marshal2CachedObject(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=381643&r1=381642&r2=381643&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 04:36:22 2006
@@ -74,12 +74,12 @@
         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);
-        
+    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);
+    
         return rc + 2;
     }
 
@@ -90,13 +90,13 @@
         base.Marshal2(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);
+    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);
 
     }
   }

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/MessageDispatchMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/MessageDispatchMarshaller.cs?rev=381643&r1=381642&r2=381643&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/MessageDispatchMarshaller.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/MessageDispatchMarshaller.cs Tue Feb 28 04:36:22 2006
@@ -71,10 +71,10 @@
         MessageDispatch info = (MessageDispatch)o;
 
         int rc = base.Marshal1(wireFormat, info, bs);
-        rc += Marshal1CachedObject(wireFormat, info.ConsumerId, bs);
-        rc += Marshal1CachedObject(wireFormat, info.Destination, bs);
-        rc += Marshal1NestedObject(wireFormat, info.Message, bs);
-        
+    rc += Marshal1CachedObject(wireFormat, info.ConsumerId, bs);
+    rc += Marshal1CachedObject(wireFormat, info.Destination, bs);
+    rc += Marshal1NestedObject(wireFormat, info.Message, bs);
+    
         return rc + 1;
     }
 
@@ -85,10 +85,10 @@
         base.Marshal2(wireFormat, o, dataOut, bs);
 
         MessageDispatch info = (MessageDispatch)o;
-        Marshal2CachedObject(wireFormat, info.ConsumerId, dataOut, bs);
-        Marshal2CachedObject(wireFormat, info.Destination, dataOut, bs);
-        Marshal2NestedObject(wireFormat, info.Message, dataOut, bs);
-        DataStreamMarshaller.WriteInt(info.RedeliveryCounter, dataOut);
+    Marshal2CachedObject(wireFormat, info.ConsumerId, dataOut, bs);
+    Marshal2CachedObject(wireFormat, info.Destination, dataOut, bs);
+    Marshal2NestedObject(wireFormat, info.Message, dataOut, bs);
+    DataStreamMarshaller.WriteInt(info.RedeliveryCounter, dataOut);
 
     }
   }

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/MessageDispatchNotificationMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/MessageDispatchNotificationMarshaller.cs?rev=381643&r1=381642&r2=381643&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/MessageDispatchNotificationMarshaller.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/MessageDispatchNotificationMarshaller.cs Tue Feb 28 04:36:22 2006
@@ -71,10 +71,10 @@
         MessageDispatchNotification info = (MessageDispatchNotification)o;
 
         int rc = base.Marshal1(wireFormat, info, bs);
-        rc += Marshal1CachedObject(wireFormat, info.ConsumerId, bs);
-        rc += Marshal1CachedObject(wireFormat, info.Destination, bs);
-        rc += Marshal1Long(wireFormat, info.DeliverySequenceId, bs);
-        rc += Marshal1NestedObject(wireFormat, info.MessageId, bs);
+    rc += Marshal1CachedObject(wireFormat, info.ConsumerId, bs);
+    rc += Marshal1CachedObject(wireFormat, info.Destination, bs);
+    rc += Marshal1Long(wireFormat, info.DeliverySequenceId, bs);
+    rc += Marshal1NestedObject(wireFormat, info.MessageId, bs);
 
         return rc + 0;
     }
@@ -86,10 +86,10 @@
         base.Marshal2(wireFormat, o, dataOut, bs);
 
         MessageDispatchNotification info = (MessageDispatchNotification)o;
-        Marshal2CachedObject(wireFormat, info.ConsumerId, dataOut, bs);
-        Marshal2CachedObject(wireFormat, info.Destination, dataOut, bs);
-        Marshal2Long(wireFormat, info.DeliverySequenceId, dataOut, bs);
-        Marshal2NestedObject(wireFormat, info.MessageId, dataOut, bs);
+    Marshal2CachedObject(wireFormat, info.ConsumerId, dataOut, bs);
+    Marshal2CachedObject(wireFormat, info.Destination, dataOut, bs);
+    Marshal2Long(wireFormat, info.DeliverySequenceId, dataOut, bs);
+    Marshal2NestedObject(wireFormat, info.MessageId, dataOut, bs);
 
     }
   }

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/MessageIdMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/MessageIdMarshaller.cs?rev=381643&r1=381642&r2=381643&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/MessageIdMarshaller.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/MessageIdMarshaller.cs Tue Feb 28 04:36:22 2006
@@ -70,9 +70,9 @@
         MessageId info = (MessageId)o;
 
         int rc = base.Marshal1(wireFormat, info, bs);
-        rc += Marshal1CachedObject(wireFormat, info.ProducerId, bs);
-        rc += Marshal1Long(wireFormat, info.ProducerSequenceId, bs);
-        rc += Marshal1Long(wireFormat, info.BrokerSequenceId, bs);
+    rc += Marshal1CachedObject(wireFormat, info.ProducerId, bs);
+    rc += Marshal1Long(wireFormat, info.ProducerSequenceId, bs);
+    rc += Marshal1Long(wireFormat, info.BrokerSequenceId, bs);
 
         return rc + 0;
     }
@@ -84,9 +84,9 @@
         base.Marshal2(wireFormat, o, dataOut, bs);
 
         MessageId info = (MessageId)o;
-        Marshal2CachedObject(wireFormat, info.ProducerId, dataOut, bs);
-        Marshal2Long(wireFormat, info.ProducerSequenceId, dataOut, bs);
-        Marshal2Long(wireFormat, info.BrokerSequenceId, dataOut, bs);
+    Marshal2CachedObject(wireFormat, info.ProducerId, dataOut, bs);
+    Marshal2Long(wireFormat, info.ProducerSequenceId, dataOut, bs);
+    Marshal2Long(wireFormat, info.BrokerSequenceId, dataOut, bs);
 
     }
   }

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/MessageMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/MessageMarshaller.cs?rev=381643&r1=381642&r2=381643&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/MessageMarshaller.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/MessageMarshaller.cs Tue Feb 28 04:36:22 2006
@@ -92,30 +92,30 @@
         Message info = (Message)o;
 
         int rc = base.Marshal1(wireFormat, info, bs);
-        rc += Marshal1CachedObject(wireFormat, info.ProducerId, bs);
-        rc += Marshal1CachedObject(wireFormat, info.Destination, bs);
-        rc += Marshal1CachedObject(wireFormat, info.TransactionId, bs);
-        rc += Marshal1CachedObject(wireFormat, info.OriginalDestination, bs);
-        rc += Marshal1NestedObject(wireFormat, info.MessageId, bs);
-        rc += Marshal1CachedObject(wireFormat, info.OriginalTransactionId, bs);
-        rc += WriteString(info.GroupID, bs);
-                rc += WriteString(info.CorrelationId, bs);
-        bs.WriteBoolean(info.Persistent);
-        rc += Marshal1Long(wireFormat, info.Expiration, bs);
-                rc += Marshal1NestedObject(wireFormat, info.ReplyTo, bs);
-        rc += Marshal1Long(wireFormat, info.Timestamp, bs);
-        rc += WriteString(info.Type, bs);
-        bs.WriteBoolean(info.Content!=null);
+    rc += Marshal1CachedObject(wireFormat, info.ProducerId, bs);
+    rc += Marshal1CachedObject(wireFormat, info.Destination, bs);
+    rc += Marshal1CachedObject(wireFormat, info.TransactionId, bs);
+    rc += Marshal1CachedObject(wireFormat, info.OriginalDestination, bs);
+    rc += Marshal1NestedObject(wireFormat, info.MessageId, bs);
+    rc += Marshal1CachedObject(wireFormat, info.OriginalTransactionId, bs);
+    rc += WriteString(info.GroupID, bs);
+        rc += WriteString(info.CorrelationId, bs);
+    bs.WriteBoolean(info.Persistent);
+    rc += Marshal1Long(wireFormat, info.Expiration, bs);
+        rc += Marshal1NestedObject(wireFormat, info.ReplyTo, bs);
+    rc += Marshal1Long(wireFormat, info.Timestamp, bs);
+    rc += WriteString(info.Type, bs);
+    bs.WriteBoolean(info.Content!=null);
         rc += info.Content==null ? 0 : info.Content.Length+4;
-        bs.WriteBoolean(info.MarshalledProperties!=null);
+    bs.WriteBoolean(info.MarshalledProperties!=null);
         rc += info.MarshalledProperties==null ? 0 : info.MarshalledProperties.Length+4;
-        rc += Marshal1NestedObject(wireFormat, info.DataStructure, bs);
-        rc += Marshal1CachedObject(wireFormat, info.TargetConsumerId, bs);
-        bs.WriteBoolean(info.Compressed);
-                rc += MarshalObjectArray(wireFormat, info.BrokerPath, bs);
-        rc += Marshal1Long(wireFormat, info.Arrival, bs);
-        rc += WriteString(info.UserID, bs);
-        bs.WriteBoolean(info.RecievedByDFBridge);
+    rc += Marshal1NestedObject(wireFormat, info.DataStructure, bs);
+    rc += Marshal1CachedObject(wireFormat, info.TargetConsumerId, bs);
+    bs.WriteBoolean(info.Compressed);
+        rc += MarshalObjectArray(wireFormat, info.BrokerPath, bs);
+    rc += Marshal1Long(wireFormat, info.Arrival, bs);
+    rc += WriteString(info.UserID, bs);
+    bs.WriteBoolean(info.RecievedByDFBridge);
 
         return rc + 3;
     }
@@ -127,37 +127,37 @@
         base.Marshal2(wireFormat, o, dataOut, bs);
 
         Message info = (Message)o;
-        Marshal2CachedObject(wireFormat, info.ProducerId, dataOut, bs);
-        Marshal2CachedObject(wireFormat, info.Destination, dataOut, bs);
-        Marshal2CachedObject(wireFormat, info.TransactionId, dataOut, bs);
-        Marshal2CachedObject(wireFormat, info.OriginalDestination, dataOut, bs);
-        Marshal2NestedObject(wireFormat, info.MessageId, dataOut, bs);
-        Marshal2CachedObject(wireFormat, info.OriginalTransactionId, dataOut, bs);
-        WriteString(info.GroupID, dataOut, bs);
-        DataStreamMarshaller.WriteInt(info.GroupSequence, dataOut);
-        WriteString(info.CorrelationId, dataOut, bs);
-        bs.ReadBoolean();
-        Marshal2Long(wireFormat, info.Expiration, dataOut, bs);
-        DataStreamMarshaller.WriteByte(info.Priority, dataOut);
-        Marshal2NestedObject(wireFormat, info.ReplyTo, dataOut, bs);
-        Marshal2Long(wireFormat, info.Timestamp, dataOut, bs);
-        WriteString(info.Type, dataOut, bs);
-        if(bs.ReadBoolean()) {
+    Marshal2CachedObject(wireFormat, info.ProducerId, dataOut, bs);
+    Marshal2CachedObject(wireFormat, info.Destination, dataOut, bs);
+    Marshal2CachedObject(wireFormat, info.TransactionId, dataOut, bs);
+    Marshal2CachedObject(wireFormat, info.OriginalDestination, dataOut, bs);
+    Marshal2NestedObject(wireFormat, info.MessageId, dataOut, bs);
+    Marshal2CachedObject(wireFormat, info.OriginalTransactionId, dataOut, bs);
+    WriteString(info.GroupID, dataOut, bs);
+    DataStreamMarshaller.WriteInt(info.GroupSequence, dataOut);
+    WriteString(info.CorrelationId, dataOut, bs);
+    bs.ReadBoolean();
+    Marshal2Long(wireFormat, info.Expiration, dataOut, bs);
+    DataStreamMarshaller.WriteByte(info.Priority, dataOut);
+    Marshal2NestedObject(wireFormat, info.ReplyTo, dataOut, bs);
+    Marshal2Long(wireFormat, info.Timestamp, dataOut, bs);
+    WriteString(info.Type, dataOut, bs);
+    if(bs.ReadBoolean()) {
            DataStreamMarshaller.WriteInt(info.Content.Length, dataOut);
            dataOut.Write(info.Content);
         }
-        if(bs.ReadBoolean()) {
+    if(bs.ReadBoolean()) {
            DataStreamMarshaller.WriteInt(info.MarshalledProperties.Length, dataOut);
            dataOut.Write(info.MarshalledProperties);
         }
-        Marshal2NestedObject(wireFormat, info.DataStructure, dataOut, bs);
-        Marshal2CachedObject(wireFormat, info.TargetConsumerId, dataOut, bs);
-        bs.ReadBoolean();
-        DataStreamMarshaller.WriteInt(info.RedeliveryCounter, dataOut);
-        MarshalObjectArray(wireFormat, info.BrokerPath, dataOut, bs);
-        Marshal2Long(wireFormat, info.Arrival, dataOut, bs);
-        WriteString(info.UserID, dataOut, bs);
-        bs.ReadBoolean();
+    Marshal2NestedObject(wireFormat, info.DataStructure, dataOut, bs);
+    Marshal2CachedObject(wireFormat, info.TargetConsumerId, dataOut, bs);
+    bs.ReadBoolean();
+    DataStreamMarshaller.WriteInt(info.RedeliveryCounter, dataOut);
+    MarshalObjectArray(wireFormat, info.BrokerPath, dataOut, bs);
+    Marshal2Long(wireFormat, info.Arrival, dataOut, bs);
+    WriteString(info.UserID, dataOut, bs);
+    bs.ReadBoolean();
 
     }
   }

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/ProducerIdMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/ProducerIdMarshaller.cs?rev=381643&r1=381642&r2=381643&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/ProducerIdMarshaller.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/ProducerIdMarshaller.cs Tue Feb 28 04:36:22 2006
@@ -70,9 +70,9 @@
         ProducerId info = (ProducerId)o;
 
         int rc = base.Marshal1(wireFormat, info, bs);
-        rc += WriteString(info.ConnectionId, bs);
-        rc += Marshal1Long(wireFormat, info.Value, bs);
-        rc += Marshal1Long(wireFormat, info.SessionId, bs);
+    rc += WriteString(info.ConnectionId, bs);
+    rc += Marshal1Long(wireFormat, info.Value, bs);
+    rc += Marshal1Long(wireFormat, info.SessionId, bs);
 
         return rc + 0;
     }
@@ -84,9 +84,9 @@
         base.Marshal2(wireFormat, o, dataOut, bs);
 
         ProducerId info = (ProducerId)o;
-        WriteString(info.ConnectionId, dataOut, bs);
-        Marshal2Long(wireFormat, info.Value, dataOut, bs);
-        Marshal2Long(wireFormat, info.SessionId, dataOut, bs);
+    WriteString(info.ConnectionId, dataOut, bs);
+    Marshal2Long(wireFormat, info.Value, dataOut, bs);
+    Marshal2Long(wireFormat, info.SessionId, dataOut, bs);
 
     }
   }

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/ProducerInfoMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/ProducerInfoMarshaller.cs?rev=381643&r1=381642&r2=381643&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/ProducerInfoMarshaller.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/ProducerInfoMarshaller.cs Tue Feb 28 04:36:22 2006
@@ -81,9 +81,9 @@
         ProducerInfo info = (ProducerInfo)o;
 
         int rc = base.Marshal1(wireFormat, info, bs);
-        rc += Marshal1CachedObject(wireFormat, info.ProducerId, bs);
-        rc += Marshal1CachedObject(wireFormat, info.Destination, bs);
-        rc += MarshalObjectArray(wireFormat, info.BrokerPath, bs);
+    rc += Marshal1CachedObject(wireFormat, info.ProducerId, bs);
+    rc += Marshal1CachedObject(wireFormat, info.Destination, bs);
+    rc += MarshalObjectArray(wireFormat, info.BrokerPath, bs);
 
         return rc + 0;
     }
@@ -95,9 +95,9 @@
         base.Marshal2(wireFormat, o, dataOut, bs);
 
         ProducerInfo info = (ProducerInfo)o;
-        Marshal2CachedObject(wireFormat, info.ProducerId, dataOut, bs);
-        Marshal2CachedObject(wireFormat, info.Destination, dataOut, bs);
-        MarshalObjectArray(wireFormat, info.BrokerPath, dataOut, bs);
+    Marshal2CachedObject(wireFormat, info.ProducerId, dataOut, bs);
+    Marshal2CachedObject(wireFormat, info.Destination, dataOut, bs);
+    MarshalObjectArray(wireFormat, info.BrokerPath, dataOut, bs);
 
     }
   }

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/RemoveInfoMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/RemoveInfoMarshaller.cs?rev=381643&r1=381642&r2=381643&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/RemoveInfoMarshaller.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/RemoveInfoMarshaller.cs Tue Feb 28 04:36:22 2006
@@ -68,7 +68,7 @@
         RemoveInfo info = (RemoveInfo)o;
 
         int rc = base.Marshal1(wireFormat, info, bs);
-        rc += Marshal1CachedObject(wireFormat, info.ObjectId, bs);
+    rc += Marshal1CachedObject(wireFormat, info.ObjectId, bs);
 
         return rc + 0;
     }
@@ -80,7 +80,7 @@
         base.Marshal2(wireFormat, o, dataOut, bs);
 
         RemoveInfo info = (RemoveInfo)o;
-        Marshal2CachedObject(wireFormat, info.ObjectId, dataOut, bs);
+    Marshal2CachedObject(wireFormat, info.ObjectId, dataOut, bs);
 
     }
   }

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/RemoveSubscriptionInfoMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/RemoveSubscriptionInfoMarshaller.cs?rev=381643&r1=381642&r2=381643&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/RemoveSubscriptionInfoMarshaller.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/RemoveSubscriptionInfoMarshaller.cs Tue Feb 28 04:36:22 2006
@@ -70,9 +70,9 @@
         RemoveSubscriptionInfo info = (RemoveSubscriptionInfo)o;
 
         int rc = base.Marshal1(wireFormat, info, bs);
-        rc += Marshal1CachedObject(wireFormat, info.ConnectionId, bs);
-        rc += WriteString(info.SubcriptionName, bs);
-        rc += WriteString(info.ClientId, bs);
+    rc += Marshal1CachedObject(wireFormat, info.ConnectionId, bs);
+    rc += WriteString(info.SubcriptionName, bs);
+    rc += WriteString(info.ClientId, bs);
 
         return rc + 0;
     }
@@ -84,9 +84,9 @@
         base.Marshal2(wireFormat, o, dataOut, bs);
 
         RemoveSubscriptionInfo info = (RemoveSubscriptionInfo)o;
-        Marshal2CachedObject(wireFormat, info.ConnectionId, dataOut, bs);
-        WriteString(info.SubcriptionName, dataOut, bs);
-        WriteString(info.ClientId, dataOut, bs);
+    Marshal2CachedObject(wireFormat, info.ConnectionId, dataOut, bs);
+    WriteString(info.SubcriptionName, dataOut, bs);
+    WriteString(info.ClientId, dataOut, bs);
 
     }
   }

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/ResponseMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/ResponseMarshaller.cs?rev=381643&r1=381642&r2=381643&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/ResponseMarshaller.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/ResponseMarshaller.cs Tue Feb 28 04:36:22 2006
@@ -68,7 +68,7 @@
         Response info = (Response)o;
 
         int rc = base.Marshal1(wireFormat, info, bs);
-        
+    
         return rc + 1;
     }
 
@@ -79,7 +79,7 @@
         base.Marshal2(wireFormat, o, dataOut, bs);
 
         Response info = (Response)o;
-        DataStreamMarshaller.WriteShort(info.CorrelationId, dataOut);
+    DataStreamMarshaller.WriteShort(info.CorrelationId, dataOut);
 
     }
   }

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/SessionIdMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/SessionIdMarshaller.cs?rev=381643&r1=381642&r2=381643&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/SessionIdMarshaller.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/SessionIdMarshaller.cs Tue Feb 28 04:36:22 2006
@@ -69,8 +69,8 @@
         SessionId info = (SessionId)o;
 
         int rc = base.Marshal1(wireFormat, info, bs);
-        rc += WriteString(info.ConnectionId, bs);
-        rc += Marshal1Long(wireFormat, info.Value, bs);
+    rc += WriteString(info.ConnectionId, bs);
+    rc += Marshal1Long(wireFormat, info.Value, bs);
 
         return rc + 0;
     }
@@ -82,8 +82,8 @@
         base.Marshal2(wireFormat, o, dataOut, bs);
 
         SessionId info = (SessionId)o;
-        WriteString(info.ConnectionId, dataOut, bs);
-        Marshal2Long(wireFormat, info.Value, dataOut, bs);
+    WriteString(info.ConnectionId, dataOut, bs);
+    Marshal2Long(wireFormat, info.Value, dataOut, bs);
 
     }
   }

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/SessionInfoMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/SessionInfoMarshaller.cs?rev=381643&r1=381642&r2=381643&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/SessionInfoMarshaller.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/SessionInfoMarshaller.cs Tue Feb 28 04:36:22 2006
@@ -68,7 +68,7 @@
         SessionInfo info = (SessionInfo)o;
 
         int rc = base.Marshal1(wireFormat, info, bs);
-        rc += Marshal1CachedObject(wireFormat, info.SessionId, bs);
+    rc += Marshal1CachedObject(wireFormat, info.SessionId, bs);
 
         return rc + 0;
     }
@@ -80,7 +80,7 @@
         base.Marshal2(wireFormat, o, dataOut, bs);
 
         SessionInfo info = (SessionInfo)o;
-        Marshal2CachedObject(wireFormat, info.SessionId, dataOut, bs);
+    Marshal2CachedObject(wireFormat, info.SessionId, dataOut, bs);
 
     }
   }

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/SubscriptionInfoMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/SubscriptionInfoMarshaller.cs?rev=381643&r1=381642&r2=381643&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/SubscriptionInfoMarshaller.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/SubscriptionInfoMarshaller.cs Tue Feb 28 04:36:22 2006
@@ -71,10 +71,10 @@
         SubscriptionInfo info = (SubscriptionInfo)o;
 
         int rc = base.Marshal1(wireFormat, info, bs);
-        rc += WriteString(info.ClientId, bs);
-        rc += Marshal1CachedObject(wireFormat, info.Destination, bs);
-        rc += WriteString(info.Selector, bs);
-        rc += WriteString(info.SubcriptionName, bs);
+    rc += WriteString(info.ClientId, bs);
+    rc += Marshal1CachedObject(wireFormat, info.Destination, bs);
+    rc += WriteString(info.Selector, bs);
+    rc += WriteString(info.SubcriptionName, bs);
 
         return rc + 0;
     }
@@ -86,10 +86,10 @@
         base.Marshal2(wireFormat, o, dataOut, bs);
 
         SubscriptionInfo info = (SubscriptionInfo)o;
-        WriteString(info.ClientId, dataOut, bs);
-        Marshal2CachedObject(wireFormat, info.Destination, dataOut, bs);
-        WriteString(info.Selector, dataOut, bs);
-        WriteString(info.SubcriptionName, dataOut, bs);
+    WriteString(info.ClientId, dataOut, bs);
+    Marshal2CachedObject(wireFormat, info.Destination, dataOut, bs);
+    WriteString(info.Selector, dataOut, bs);
+    WriteString(info.SubcriptionName, dataOut, bs);
 
     }
   }

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/TransactionInfoMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/TransactionInfoMarshaller.cs?rev=381643&r1=381642&r2=381643&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/TransactionInfoMarshaller.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/TransactionInfoMarshaller.cs Tue Feb 28 04:36:22 2006
@@ -70,9 +70,9 @@
         TransactionInfo info = (TransactionInfo)o;
 
         int rc = base.Marshal1(wireFormat, info, bs);
-        rc += Marshal1CachedObject(wireFormat, info.ConnectionId, bs);
-        rc += Marshal1CachedObject(wireFormat, info.TransactionId, bs);
-        
+    rc += Marshal1CachedObject(wireFormat, info.ConnectionId, bs);
+    rc += Marshal1CachedObject(wireFormat, info.TransactionId, bs);
+    
         return rc + 1;
     }
 
@@ -83,9 +83,9 @@
         base.Marshal2(wireFormat, o, dataOut, bs);
 
         TransactionInfo info = (TransactionInfo)o;
-        Marshal2CachedObject(wireFormat, info.ConnectionId, dataOut, bs);
-        Marshal2CachedObject(wireFormat, info.TransactionId, dataOut, bs);
-        DataStreamMarshaller.WriteByte(info.Type, dataOut);
+    Marshal2CachedObject(wireFormat, info.ConnectionId, dataOut, bs);
+    Marshal2CachedObject(wireFormat, info.TransactionId, dataOut, bs);
+    DataStreamMarshaller.WriteByte(info.Type, dataOut);
 
     }
   }

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/WireFormatInfoMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/WireFormatInfoMarshaller.cs?rev=381643&r1=381642&r2=381643&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/WireFormatInfoMarshaller.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/WireFormatInfoMarshaller.cs Tue Feb 28 04:36:22 2006
@@ -73,10 +73,10 @@
         WireFormatInfo info = (WireFormatInfo)o;
 
         int rc = base.Marshal1(wireFormat, info, bs);
-                        bs.WriteBoolean(info.CacheEnabled);
-        bs.WriteBoolean(info.CompressionEnabled);
-        bs.WriteBoolean(info.StackTraceEnabled);
-        bs.WriteBoolean(info.TcpNoDelayEnabled);
+            bs.WriteBoolean(info.CacheEnabled);
+    bs.WriteBoolean(info.CompressionEnabled);
+    bs.WriteBoolean(info.StackTraceEnabled);
+    bs.WriteBoolean(info.TcpNoDelayEnabled);
 
         return rc + 9;
     }
@@ -88,12 +88,12 @@
         base.Marshal2(wireFormat, o, dataOut, bs);
 
         WireFormatInfo info = (WireFormatInfo)o;
-        dataOut.Write(info.Magic, 0, 8);
-        DataStreamMarshaller.WriteInt(info.Version, dataOut);
-        bs.ReadBoolean();
-        bs.ReadBoolean();
-        bs.ReadBoolean();
-        bs.ReadBoolean();
+    dataOut.Write(info.Magic, 0, 8);
+    DataStreamMarshaller.WriteInt(info.Version, dataOut);
+    bs.ReadBoolean();
+    bs.ReadBoolean();
+    bs.ReadBoolean();
+    bs.ReadBoolean();
 
     }
   }

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/XATransactionIdMarshaller.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/XATransactionIdMarshaller.cs?rev=381643&r1=381642&r2=381643&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/XATransactionIdMarshaller.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/IO/XATransactionIdMarshaller.cs Tue Feb 28 04:36:22 2006
@@ -70,9 +70,9 @@
         XATransactionId info = (XATransactionId)o;
 
         int rc = base.Marshal1(wireFormat, info, bs);
-                bs.WriteBoolean(info.GlobalTransactionId!=null);
+        bs.WriteBoolean(info.GlobalTransactionId!=null);
         rc += info.GlobalTransactionId==null ? 0 : info.GlobalTransactionId.Length+4;
-        bs.WriteBoolean(info.BranchQualifier!=null);
+    bs.WriteBoolean(info.BranchQualifier!=null);
         rc += info.BranchQualifier==null ? 0 : info.BranchQualifier.Length+4;
 
         return rc + 1;
@@ -85,12 +85,12 @@
         base.Marshal2(wireFormat, o, dataOut, bs);
 
         XATransactionId info = (XATransactionId)o;
-        DataStreamMarshaller.WriteInt(info.FormatId, dataOut);
-        if(bs.ReadBoolean()) {
+    DataStreamMarshaller.WriteInt(info.FormatId, dataOut);
+    if(bs.ReadBoolean()) {
            DataStreamMarshaller.WriteInt(info.GlobalTransactionId.Length, dataOut);
            dataOut.Write(info.GlobalTransactionId);
         }
-        if(bs.ReadBoolean()) {
+    if(bs.ReadBoolean()) {
            DataStreamMarshaller.WriteInt(info.BranchQualifier.Length, dataOut);
            dataOut.Write(info.BranchQualifier);
         }

Modified: incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/ISession.cs
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/ISession.cs?rev=381643&r1=381642&r2=381643&view=diff
==============================================================================
--- incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/ISession.cs (original)
+++ incubator/activemq/trunk/openwire-dotnet/src/OpenWire.Client/ISession.cs Tue Feb 28 04:36:22 2006
@@ -104,6 +104,21 @@
         /// Creates a new binary message with the given body
         /// </summary>
         IBytesMessage CreateBytesMessage(byte[] body);
+
+
+        // Transaction methods
+        
+        /// <summary>
+        /// If this is a transactional session then commit all message
+        /// send and acknowledgements for producers and consumers in this session
+        /// </summary>
+        void Commit();
+        
+        /// <summary>
+        /// If this is a transactional session then rollback all message
+        /// send and acknowledgements for producers and consumers in this session
+        /// </summary>
+        void Rollback();
         
     }
 }



Mime
View raw message