Author: jgomes
Date: Tue Nov 11 14:46:37 2008
New Revision: 713208
URL: http://svn.apache.org/viewvc?rev=713208&view=rev
Log:
Fix references to NUnit libraries and Apache.NMS libraries.
Fix merging issue of extra whitespace in DispatchingThread.cs.
Modified:
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/DispatchingThread.cs
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/vs2008-activemq-test.csproj
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/vs2008-activemq.csproj
Modified:
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/DispatchingThread.cs
URL:
http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/DispatchingThread.cs?rev=713208&r1=713207&r2=713208&view=diff
==============================================================================
---
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/DispatchingThread.cs
(original)
+++
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/DispatchingThread.cs
Tue Nov 11 14:46:37 2008
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
using System;
using System.Threading;
-using Apache.NMS;
namespace Apache.NMS.ActiveMQ
@@ -37,7 +37,7 @@
m_dispatchFunc = dispatchFunc;
}
- // TODO can't use EventWaitHandle on MONO 1.0
+ // TODO can't use EventWaitHandle on MONO 1.0
public AutoResetEvent EventHandle
{
get { return m_event; }
@@ -45,21 +45,15 @@
internal event ExceptionHandler ExceptionListener
{
- add
- {
- m_exceptionListener += value;
- }
- remove
- {
- m_exceptionListener -= value;
- }
+ add { m_exceptionListener += value; }
+ remove { m_exceptionListener -= value; }
}
internal void Start()
{
- lock (this)
+ lock(this)
{
- if (m_thread == null)
+ if(m_thread == null)
{
m_bStopFlag = false;
m_thread = new Thread(new
ThreadStart(MyThreadFunc));
@@ -76,22 +70,22 @@
Stop(System.Threading.Timeout.Infinite);
}
-
internal void Stop(int timeoutMilliseconds)
{
Tracer.Info("Stopping dispatcher thread for session");
Thread localThread = null;
- lock (this)
+ lock(this)
{
localThread = m_thread;
m_thread = null;
- if (!m_bStopFlag)
+ if(!m_bStopFlag)
{
m_bStopFlag = true;
m_event.Set();
}
}
- if(localThread!=null)
+
+ if(localThread != null)
{
if(!localThread.Join(timeoutMilliseconds))
{
@@ -99,6 +93,7 @@
localThread.Abort();
}
}
+
Tracer.Info("Dispatcher thread joined");
}
@@ -107,40 +102,21 @@
Tracer.Info("Dispatcher thread started");
try
{
- while (true) // loop forever (well, at least
until we've been asked to stop)
+ while(true) // loop forever (well, at least
until we've been asked to stop)
{
- lock (this)
+ lock(this)
{
- if (m_bStopFlag)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ if(m_bStopFlag)
+ {
break;
-
-
+ }
}
-
+
try
{
m_dispatchFunc();
}
- catch (Exception ex)
+ catch(Exception ex)
{
if(m_exceptionListener != null)
{
Modified:
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/vs2008-activemq-test.csproj
URL:
http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/vs2008-activemq-test.csproj?rev=713208&r1=713207&r2=713208&view=diff
==============================================================================
---
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/vs2008-activemq-test.csproj
(original)
+++
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/vs2008-activemq-test.csproj
Tue Nov 11 14:46:37 2008
@@ -42,21 +42,21 @@
<DebugType>full</DebugType>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Apache.NMS, Version=1.1.0.0, Culture=neutral,
PublicKeyToken=2a329723af30bc8d, processorArchitecture=MSIL">
+ <Reference Include="Apache.NMS, Version=1.1.0.0, Culture=neutral,
processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>vendor\Apache.NMS\net-2.0\Apache.NMS.dll</HintPath>
+ <HintPath>lib\Apache.NMS\net-2.0\Apache.NMS.dll</HintPath>
</Reference>
- <Reference Include="Apache.NMS.Test, Version=1.1.0.0, Culture=neutral,
PublicKeyToken=2a329723af30bc8d, processorArchitecture=MSIL">
+ <Reference Include="Apache.NMS.Test, Version=1.1.0.0, Culture=neutral,
processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>vendor\Apache.NMS\net-2.0\Apache.NMS.Test.dll</HintPath>
+ <HintPath>lib\Apache.NMS\net-2.0\Apache.NMS.Test.dll</HintPath>
</Reference>
<Reference Include="nunit.framework, Version=2.4.8.0, Culture=neutral,
PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>lib\net-3.5\nunit.framework.dll</HintPath>
+ <HintPath>lib\NUnit\net-2.0\nunit.framework.dll</HintPath>
</Reference>
<Reference Include="nunit.framework.extensions, Version=2.4.8.0,
Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>lib\net-3.5\nunit.framework.extensions.dll</HintPath>
+ <HintPath>lib\NUnit\net-2.0\nunit.framework.extensions.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
Modified:
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/vs2008-activemq.csproj
URL:
http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/vs2008-activemq.csproj?rev=713208&r1=713207&r2=713208&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/vs2008-activemq.csproj
(original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/vs2008-activemq.csproj
Tue Nov 11 14:46:37 2008
@@ -57,9 +57,9 @@
<DebugType>full</DebugType>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Apache.NMS, Version=1.1.0.0, Culture=neutral,
PublicKeyToken=2a329723af30bc8d, processorArchitecture=MSIL">
+ <Reference Include="Apache.NMS, Version=1.1.0.0, Culture=neutral,
processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>vendor\Apache.NMS\net-2.0\Apache.NMS.dll</HintPath>
+ <HintPath>lib\Apache.NMS\net-2.0\Apache.NMS.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Xml" />
