activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jgo...@apache.org
Subject svn commit: r702933 - in /activemq/activemq-dotnet/Apache.NMS.ActiveMQ/tags/1.0.0: ./ src/main/csharp/MessageProducer.cs src/main/csharp/Transport/Tcp/TcpTransport.cs src/main/csharp/Transport/Tcp/TcpTransportFactory.cs
Date Wed, 08 Oct 2008 17:39:18 GMT
Author: jgomes
Date: Wed Oct  8 10:39:17 2008
New Revision: 702933

URL: http://svn.apache.org/viewvc?rev=702933&view=rev
Log:
Merged fix for building .NET 1.1.

Modified:
    activemq/activemq-dotnet/Apache.NMS.ActiveMQ/tags/1.0.0/   (props changed)
    activemq/activemq-dotnet/Apache.NMS.ActiveMQ/tags/1.0.0/src/main/csharp/MessageProducer.cs
    activemq/activemq-dotnet/Apache.NMS.ActiveMQ/tags/1.0.0/src/main/csharp/Transport/Tcp/TcpTransport.cs
    activemq/activemq-dotnet/Apache.NMS.ActiveMQ/tags/1.0.0/src/main/csharp/Transport/Tcp/TcpTransportFactory.cs

Propchange: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/tags/1.0.0/
------------------------------------------------------------------------------
    svn:mergeinfo = /activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk:700915

Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/tags/1.0.0/src/main/csharp/MessageProducer.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/tags/1.0.0/src/main/csharp/MessageProducer.cs?rev=702933&r1=702932&r2=702933&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/tags/1.0.0/src/main/csharp/MessageProducer.cs
(original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/tags/1.0.0/src/main/csharp/MessageProducer.cs
Wed Oct  8 10:39:17 2008
@@ -32,7 +32,7 @@
 		private long messageCounter = 0;
 
 		private bool msgPersistent = NMSConstants.defaultPersistence;
-		private TimeSpan requestTimeout;
+		private TimeSpan requestTimeout = NMSConstants.defaultRequestTimeout;
 		private TimeSpan msgTimeToLive = NMSConstants.defaultTimeToLive;
 		private byte msgPriority = NMSConstants.defaultPriority;
 		private bool disableMessageID = false;

Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/tags/1.0.0/src/main/csharp/Transport/Tcp/TcpTransport.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/tags/1.0.0/src/main/csharp/Transport/Tcp/TcpTransport.cs?rev=702933&r1=702932&r2=702933&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/tags/1.0.0/src/main/csharp/Transport/Tcp/TcpTransport.cs
(original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/tags/1.0.0/src/main/csharp/Transport/Tcp/TcpTransport.cs
Wed Oct  8 10:39:17 2008
@@ -151,7 +151,7 @@
 
 		public bool TcpNoDelayEnabled
 		{
-#if !NETCF
+#if !NETCF && !NET_1_1
 			get { return this.socket.NoDelay; }
 			set { this.socket.NoDelay = value; }
 #else

Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/tags/1.0.0/src/main/csharp/Transport/Tcp/TcpTransportFactory.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/tags/1.0.0/src/main/csharp/Transport/Tcp/TcpTransportFactory.cs?rev=702933&r1=702932&r2=702933&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/tags/1.0.0/src/main/csharp/Transport/Tcp/TcpTransportFactory.cs
(original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/tags/1.0.0/src/main/csharp/Transport/Tcp/TcpTransportFactory.cs
Wed Oct  8 10:39:17 2008
@@ -114,7 +114,7 @@
 			Tracer.Debug("Opening socket to: " + location.Host + " on port: " + location.Port);
 			Socket socket = Connect(location.Host, location.Port);
 
-#if !NETCF
+#if !NETCF && !NET_1_1
 			socket.ReceiveBufferSize = ReceiveBufferSize;
 			socket.SendBufferSize = SendBufferSize;
 			socket.ReceiveTimeout = ReceiveTimeout;



Mime
View raw message