You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by jg...@apache.org on 2008/10/18 01:37:09 UTC
svn commit: r705782 - in /activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk: ./
deploy/ lib/ nant-common.xml src/main/csharp/MessageConsumer.cs
src/main/csharp/PrimitiveMap.cs vs2008-msmq-test.csproj vs2008-msmq.csproj
vs2008-msmq.sln
Author: jgomes
Date: Fri Oct 17 16:37:09 2008
New Revision: 705782
URL: http://svn.apache.org/viewvc?rev=705782&view=rev
Log:
Merge changes for .NET 1.1 build from 1.0.0 tag.
Modified:
activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/ (props changed)
activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/deploy/ (props changed)
activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/lib/ (props changed)
activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/nant-common.xml (props changed)
activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/src/main/csharp/MessageConsumer.cs
activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/src/main/csharp/PrimitiveMap.cs
activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/vs2008-msmq-test.csproj (props changed)
activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/vs2008-msmq.csproj (props changed)
activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/vs2008-msmq.sln (props changed)
Propchange: activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Oct 17 16:37:09 2008
@@ -0,0 +1 @@
+/activemq/activemq-dotnet/Apache.NMS.MSMQ/tags/1.0.0:705776-705779
Propchange: activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/deploy/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 17 16:37:09 2008
@@ -0,0 +1 @@
+/activemq/activemq-dotnet/Apache.NMS.MSMQ/tags/1.0.0/deploy:705776-705779
Propchange: activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/lib/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 17 16:37:09 2008
@@ -0,0 +1 @@
+/activemq/activemq-dotnet/Apache.NMS.MSMQ/tags/1.0.0/lib:705776-705779
Propchange: activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/nant-common.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 17 16:37:09 2008
@@ -0,0 +1 @@
+/activemq/activemq-dotnet/Apache.NMS.MSMQ/tags/1.0.0/nant-common.xml:705776-705779
Modified: activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/src/main/csharp/MessageConsumer.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/src/main/csharp/MessageConsumer.cs?rev=705782&r1=705781&r2=705782&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/src/main/csharp/MessageConsumer.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/src/main/csharp/MessageConsumer.cs Fri Oct 17 16:37:09 2008
@@ -90,7 +90,7 @@
protected virtual void StartAsyncDelivery()
{
if (asyncDelivery.CompareAndSet(false, true)) {
- Thread thread = new Thread(DispatchLoop);
+ Thread thread = new Thread(new ThreadStart(DispatchLoop));
thread.IsBackground = true;
thread.Start();
}
Modified: activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/src/main/csharp/PrimitiveMap.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/src/main/csharp/PrimitiveMap.cs?rev=705782&r1=705781&r2=705782&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/src/main/csharp/PrimitiveMap.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/src/main/csharp/PrimitiveMap.cs Fri Oct 17 16:37:09 2008
@@ -17,9 +17,6 @@
using Apache.NMS;
using System;
using System.Collections;
-#if !MONO
-using System.Collections.Generic;
-#endif
namespace Apache.NMS.MSMQ
{
@@ -44,11 +41,7 @@
public const byte LIST_TYPE = 12;
public const byte BIG_STRING_TYPE = 13;
-#if MONO
- private IDictionary dictionary = new Hashtable();
-#else
- private Dictionary<String, object> dictionary = new Dictionary<String, object>();
-#endif
+ private IDictionary dictionary = Hashtable.Synchronized(new Hashtable());
public void Clear()
{
@@ -57,7 +50,7 @@
public bool Contains(Object key)
{
- return dictionary.ContainsKey((string) key);
+ return dictionary.Contains(key);
}
public void Remove(Object key)
@@ -247,7 +240,6 @@
dictionary[key] = value;
}
-
protected virtual Object GetValue(String key)
{
return dictionary[key];
@@ -279,25 +271,24 @@
/// <returns>A string</returns>
public override String ToString()
{
- String s = "{";
- bool first = true;
-#if MONO
- foreach (DictionaryEntry entry in dictionary)
-#else
- foreach (KeyValuePair<String, object> entry in dictionary)
-#endif
- {
- if (!first)
- {
- s += ", ";
- }
- first = false;
- String name = (String)entry.Key;
- Object value = entry.Value;
- s += name + "=" + value;
- }
- s += "}";
- return s;
+ String s="{";
+ bool first=true;
+ lock(dictionary.SyncRoot)
+ {
+ foreach(DictionaryEntry entry in dictionary)
+ {
+ if(!first)
+ {
+ s+=", ";
+ }
+ first=false;
+ String name = (String) entry.Key;
+ Object value = entry.Value;
+ s += name + "=" + value;
+ }
+ }
+ s += "}";
+ return s;
}
}
}
Propchange: activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/vs2008-msmq-test.csproj
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 17 16:37:09 2008
@@ -0,0 +1 @@
+/activemq/activemq-dotnet/Apache.NMS.MSMQ/tags/1.0.0/vs2008-msmq-test.csproj:705776-705779
Propchange: activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/vs2008-msmq.csproj
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 17 16:37:09 2008
@@ -0,0 +1 @@
+/activemq/activemq-dotnet/Apache.NMS.MSMQ/tags/1.0.0/vs2008-msmq.csproj:705776-705779
Propchange: activemq/activemq-dotnet/Apache.NMS.MSMQ/trunk/vs2008-msmq.sln
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 17 16:37:09 2008
@@ -0,0 +1 @@
+/activemq/activemq-dotnet/Apache.NMS.MSMQ/tags/1.0.0/vs2008-msmq.sln:705776-705779