You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by st...@apache.org on 2006/12/13 18:59:51 UTC
svn commit: r486778 - in
/incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/Message:
AbstractQmsMessage.cs QpidBytesMessage.cs QpidTextMessage.cs
Author: steshaw
Date: Wed Dec 13 09:59:50 2006
New Revision: 486778
URL: http://svn.apache.org/viewvc?view=rev&rev=486778
Log:
QPID-182. GRM broke :(. We need to flip the buffer when getting the Data from the AbstractQmsMessage.
Also removed some commented out code.
Modified:
incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/Message/AbstractQmsMessage.cs
incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/Message/QpidBytesMessage.cs
incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/Message/QpidTextMessage.cs
Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/Message/AbstractQmsMessage.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/Message/AbstractQmsMessage.cs?view=diff&rev=486778&r1=486777&r2=486778
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/Message/AbstractQmsMessage.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/Message/AbstractQmsMessage.cs Wed Dec 13 09:59:50 2006
@@ -32,29 +32,11 @@
{
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 @@
{
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;
}
@@ -464,22 +453,6 @@
return table;
}
}
-
- /// <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
{
Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/Message/QpidBytesMessage.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/Message/QpidBytesMessage.cs?view=diff&rev=486778&r1=486777&r2=486778
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/Message/QpidBytesMessage.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/Message/QpidBytesMessage.cs Wed Dec 13 09:59:50 2006
@@ -334,7 +334,7 @@
{
base.Reset();
_data.flip();
- }
+ }
/**
* Check that there is at least a certain number of bytes available to read
Modified: incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/Message/QpidTextMessage.cs
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/Message/QpidTextMessage.cs?view=diff&rev=486778&r1=486777&r2=486778
==============================================================================
--- incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/Message/QpidTextMessage.cs (original)
+++ incubator/qpid/trunk/qpid/dotnet/Qpid.Client/Client/Message/QpidTextMessage.cs Wed Dec 13 09:59:50 2006
@@ -49,15 +49,6 @@
_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)