QPID-173. Re-port JmsByteBytes (QpidBytesMessage) from Java. Notably missing was the _data.rewind() in the Text getter. Also removed/tidied up some commented out code.

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

1 files changed, 4 insertions, 30 deletions

diff --git a/dotnet/Qpid.Client/Client/Message/QpidTextMessage.cs b/dotnet/Qpid.Client/Client/Message/QpidTextMessage.cs
index 650186a90b..d56f2c0857 100644
--- a/dotnet/Qpid.Client/Client/Message/QpidTextMessage.cs
+++ b/dotnet/Qpid.Client/Client/Message/QpidTextMessage.cs
@@ -30,35 +30,7 @@ namespace Qpid.Client.Message
     {
         private const string MIME_TYPE = "text/plain";
 
-        private string _decodedValue;
-
-        //public QpidTextMessage() : this(null, null)
-        //{        
-        //}
-
-        //public QpidTextMessage(byte[] data, String encoding) : base()
-        //{
-        //    // the superclass has instantied a content header at this point
-        //    ContentHeaderProperties.ContentType= MIME_TYPE;
-        //    _data = data;
-        //    ContentHeaderProperties.Encoding = encoding;
-        //}
-
-        //public QpidTextMessage(ulong messageNbr, byte[] data, BasicContentHeaderProperties contentHeader)
-        //    : base(messageNbr, contentHeader)
-        //{            
-        //    contentHeader.ContentType = MIME_TYPE;
-        //    _data = data;
-        //}
-
-        //public QpidTextMessage(byte[] data) : this(data, null)
-        //{            
-        //}
-
-        //public QpidTextMessage(string text)
-        //{
-        //    Text = text;
-        //}
+        private string _decodedValue = null;
 
         internal QpidTextMessage() : this(null, null)
         {
@@ -74,7 +46,7 @@ namespace Qpid.Client.Message
             :base(deliveryTag, contentHeader, data)
         {
             contentHeader.ContentType = MIME_TYPE;
-            _data = data;
+            _data = data; // FIXME: Unnecessary - done in base class ctor.
         }
 
         QpidTextMessage(ByteBuffer data) : this(data, null)
@@ -123,6 +95,8 @@ namespace Qpid.Client.Message
                 }
                 else
                 {
+                    _data.rewind();
+
                     // Read remaining bytes.
                     byte[] bytes = new byte[_data.remaining()];
                     _data.get(bytes);