You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ta...@apache.org on 2009/12/09 22:11:54 UTC
svn commit: r888975 - in /activemq/activemq-dotnet/Apache.NMS.Stomp/trunk:
Apache.NMS.Stomp.Test.nunit src/main/csharp/MessageProducer.cs
src/main/csharp/Protocol/StompFrame.cs
src/main/csharp/Protocol/StompWireFormat.cs
Author: tabish
Date: Wed Dec 9 21:11:54 2009
New Revision: 888975
URL: http://svn.apache.org/viewvc?rev=888975&view=rev
Log:
Stomp client can connect to Broker now but errors out on Send of ConnectionInfo
Modified:
activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/Apache.NMS.Stomp.Test.nunit
activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/MessageProducer.cs
activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Protocol/StompFrame.cs
activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Protocol/StompWireFormat.cs
Modified: activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/Apache.NMS.Stomp.Test.nunit
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/Apache.NMS.Stomp.Test.nunit?rev=888975&r1=888974&r2=888975&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/Apache.NMS.Stomp.Test.nunit (original)
+++ activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/Apache.NMS.Stomp.Test.nunit Wed Dec 9 21:11:54 2009
@@ -2,5 +2,6 @@
<Settings activeconfig="Default" />
<Config name="Default" binpathtype="Auto">
<assembly path="Apache.NMS.Stomp.Test.dll" />
+ <assembly path="Apache.NMS.Test.dll" />
</Config>
</NUnitProject>
Modified: activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/MessageProducer.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/MessageProducer.cs?rev=888975&r1=888974&r2=888975&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/MessageProducer.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/MessageProducer.cs Wed Dec 9 21:11:54 2009
@@ -184,7 +184,6 @@
{
throw new ConnectionClosedException();
}
-
session.DoSend(stompMessage, this, this.RequestTimeout);
}
}
Modified: activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Protocol/StompFrame.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Protocol/StompFrame.cs?rev=888975&r1=888974&r2=888975&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Protocol/StompFrame.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Protocol/StompFrame.cs Wed Dec 9 21:11:54 2009
@@ -74,6 +74,11 @@
public void SetProperty(string name, Object value)
{
+ if(value == null)
+ {
+ return;
+ }
+
this.Properties[name] = value.ToString();
}
Modified: activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Protocol/StompWireFormat.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Protocol/StompWireFormat.cs?rev=888975&r1=888974&r2=888975&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Protocol/StompWireFormat.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Protocol/StompWireFormat.cs Wed Dec 9 21:11:54 2009
@@ -127,12 +127,17 @@
text = text.Substring("ignore:".Length);
}
+ Tracer.Debug("StompWireFormat - Received RESPONSE command: CorrelationId = " + text);
+
answer.CorrelationId = Int32.Parse(text);
return answer;
}
else if(command == "CONNECTED")
{
text = frame.RemoveProperty("response-id");
+
+ Tracer.Debug("StompWireFormat - Received CONNECTED command: ResponseId = " + text);
+
if(text != null)
{
Response answer = new Response();
@@ -145,6 +150,8 @@
{
string text = frame.RemoveProperty("receipt-id");
+ Tracer.Debug("StompWireFormat - Received ERROR command: CorrelationId = " + text);
+
if(text != null && text.StartsWith("ignore:"))
{
Response answer = new Response();
@@ -167,6 +174,7 @@
}
else if(command == "MESSAGE")
{
+ Tracer.Debug("StompWireFormat - Received MESSAGE command");
return CreateMessage(frame);
}
@@ -243,7 +251,7 @@
frame.SetProperty("client-id", command.ClientId);
frame.SetProperty("login", command.UserName);
frame.SetProperty("passcode", command.Password);
- frame.SetProperty("request-id", command.CommandId.ToString());
+ frame.SetProperty("request-id", command.CommandId);
frame.ToStream(dataOut);
}