activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jgo...@apache.org
Subject svn commit: r1177391 - in /activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk: ./ src/main/csharp/Transport/InactivityMonitor.cs
Date Thu, 29 Sep 2011 18:28:20 GMT
Author: jgomes
Date: Thu Sep 29 18:28:20 2011
New Revision: 1177391

URL: http://svn.apache.org/viewvc?rev=1177391&view=rev
Log:
Merged revision(s) 1177390 from activemq/activemq-dotnet/Apache.NMS.ActiveMQ/branches/1.5.x:
Add null check.
Fixes [AMQNET-339]. (See https://issues.apache.org/jira/browse/AMQNET-339)

Modified:
    activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/   (props changed)
    activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Transport/InactivityMonitor.cs

Propchange: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 29 18:28:20 2011
@@ -1,3 +1,3 @@
-/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/branches/1.5.x:1082291,1135831,1137081,1171843,1171874
+/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/branches/1.5.x:1082291,1135831,1137081,1171843,1171874,1177390
 /activemq/activemq-dotnet/Apache.NMS.ActiveMQ/tags/1.0.0:692591,693525
 /activemq/activemq-dotnet/Apache.NMS.ActiveMQ/tags/1.1.0:788230,788233,790183

Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Transport/InactivityMonitor.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Transport/InactivityMonitor.cs?rev=1177391&r1=1177390&r2=1177391&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Transport/InactivityMonitor.cs
(original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Transport/InactivityMonitor.cs
Thu Sep 29 18:28:20 2011
@@ -144,7 +144,11 @@ namespace Apache.NMS.ActiveMQ.Transport
 			if(!commandSent.Value)
 			{
 				Tracer.DebugFormat("InactivityMonitor[{0}]: No Message sent since last write check. Sending
a KeepAliveInfo.", instanceId);
-				this.asyncWriteTask.IsPending = true;
+				if(null != this.asyncWriteTask)
+				{
+					this.asyncWriteTask.IsPending = true;
+				}
+				
 				this.asyncTasks.Wakeup();
 			}
 			else
@@ -179,7 +183,11 @@ namespace Apache.NMS.ActiveMQ.Transport
 			if(!commandReceived.Value)
 			{
 				Tracer.DebugFormat("InactivityMonitor[{0}]: No message received since last read check!
Sending an InactivityException!", instanceId);
-				this.asyncErrorTask.IsPending = true;
+				if(null != this.asyncErrorTask)
+				{
+					this.asyncErrorTask.IsPending = true;
+				}
+
 				this.asyncTasks.Wakeup();
 			}
 			else



Mime
View raw message