QPID-182. GRM broke :(. We need to flip the buffer when getting the Data from the AbstractQmsMessage.

Also removed some commented out code.

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@486778 13f79535-47bb-0310-9956-ffa450edef68

3 files changed, 11 insertions, 47 deletions

diff --git a/dotnet/Qpid.Client/Client/Message/AbstractQmsMessage.cs b/dotnet/Qpid.Client/Client/Message/AbstractQmsMessage.cs
index 035a009006..c56ea28e53 100644
--- a/dotnet/Qpid.Client/Client/Message/AbstractQmsMessage.cs
+++ b/dotnet/Qpid.Client/Client/Message/AbstractQmsMessage.cs
@@ -32,29 +32,11 @@ namespace Qpid.Client.Message
     {
         private static readonly ILog _log = LogManager.GetLogger(typeof(AbstractQmsMessage));
 
-//        protected long _messageNbr;
-
         protected bool _redelivered;
 
         protected ByteBuffer _data;
         protected bool _readableMessage = false;
 
-        //protected AbstractQmsMessage() : base(new BasicContentHeaderProperties())
-        //{           
-        //}
-
-        //protected AbstractQmsMessage(ulong messageNbr, BasicContentHeaderProperties contentHeader)
-        //    : this(contentHeader)
-        //{            
-        //    _messageNbr = messageNbr;
-        //}
-
-        //protected AbstractQmsMessage(BasicContentHeaderProperties contentHeader) 
-        //    : base(contentHeader)
-        //{            
-        //}
-
-
 #region new_java_ctrs
 
         protected AbstractQmsMessage(ByteBuffer data)
@@ -374,11 +356,18 @@ namespace Qpid.Client.Message
         {
             get
             {
-                // make sure we rewind the data just in case any method has moved the
-                // position beyond the start
                 if (_data != null)
                 {
-                    _data.rewind();
+                    if (!_readableMessage)
+                    {
+                        _data.flip();
+                    }
+                    else
+                    {
+                        // Make sure we rewind the data just in case any method has moved the
+                        // position beyond the start.
+                        _data.rewind();
+                    }
                 }
                 return _data;
             }
@@ -465,22 +454,6 @@ namespace Qpid.Client.Message
             }
         }
 
-        /// <summary>
-        /// Get the AMQ message number assigned to this message
-        /// </summary>
-        /// <returns>the message number</returns>
-        //public ulong MessageNbr
-        //{
-        //    get
-        //    {
-        //        return _messageNbr;
-        //    }
-        //    set
-        //    {
-        //        _messageNbr = value;
-        //    }
-        //}        
-
         public BasicContentHeaderProperties ContentHeaderProperties
         {
             get
diff --git a/dotnet/Qpid.Client/Client/Message/QpidBytesMessage.cs b/dotnet/Qpid.Client/Client/Message/QpidBytesMessage.cs
index d5574e892f..6287b05001 100644
--- a/dotnet/Qpid.Client/Client/Message/QpidBytesMessage.cs
+++ b/dotnet/Qpid.Client/Client/Message/QpidBytesMessage.cs
@@ -334,7 +334,7 @@ namespace Qpid.Client.Message
         {
             base.Reset();
             _data.flip();
-        }        
+        }
 
         /**
          * Check that there is at least a certain number of bytes available to read
diff --git a/dotnet/Qpid.Client/Client/Message/QpidTextMessage.cs b/dotnet/Qpid.Client/Client/Message/QpidTextMessage.cs
index d56f2c0857..317d2283f3 100644
--- a/dotnet/Qpid.Client/Client/Message/QpidTextMessage.cs
+++ b/dotnet/Qpid.Client/Client/Message/QpidTextMessage.cs
@@ -49,15 +49,6 @@ namespace Qpid.Client.Message
             _data = data; // FIXME: Unnecessary - done in base class ctor.
         }
 
-        QpidTextMessage(ByteBuffer data) : this(data, null)
-        {
-        }
-
-        QpidTextMessage(String text) : base((ByteBuffer)null)
-        {
-            Text = text;
-        }
-
         public override void ClearBodyImpl()
         {
             if (_data != null)