Author: tabish
Date: Fri Nov 5 21:41:34 2010
New Revision: 1031822
URL: http://svn.apache.org/viewvc?rev=1031822&view=rev
Log:
Cleans up some missed commented out code and removes some warnings seen during
compilation on Mono 2.8
Modified:
activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/MessageConsumer.cs
activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Threads/DedicatedTaskRunner.cs
activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Util/IdGenerator.cs
Modified:
activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/MessageConsumer.cs
URL:
http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/MessageConsumer.cs?rev=1031822&r1=1031821&r2=1031822&view=diff
==============================================================================
---
activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/MessageConsumer.cs
(original)
+++
activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/MessageConsumer.cs
Fri Nov 5 21:41:34 2010
@@ -501,12 +501,6 @@ namespace Apache.NMS.Stomp
/// message if it is available if timeout > 0 then it blocks up to
timeout
/// amount of time. Expired messages will consumed by this method.
/// </summary>
- /// <param name="timeout">
- /// A <see cref="System.TimeSpan"/>
- /// </param>
- /// <returns>
- /// A <see cref="MessageDispatch"/>
- /// </returns>
private MessageDispatch Dequeue(TimeSpan timeout)
{
DateTime deadline = DateTime.Now;
Modified:
activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Threads/DedicatedTaskRunner.cs
URL:
http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Threads/DedicatedTaskRunner.cs?rev=1031822&r1=1031821&r2=1031822&view=diff
==============================================================================
---
activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Threads/DedicatedTaskRunner.cs
(original)
+++
activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Threads/DedicatedTaskRunner.cs
Fri Nov 5 21:41:34 2010
@@ -155,8 +155,6 @@ namespace Apache.NMS.Stomp.Threads
{
// Make sure we notify any waiting threads that thread
// has terminated.
- //lock(this.mutex)
- //{
Monitor.Enter(this.mutex);
this.terminated = true;
Monitor.Exit(this.mutex);
Modified:
activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Util/IdGenerator.cs
URL:
http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Util/IdGenerator.cs?rev=1031822&r1=1031821&r2=1031822&view=diff
==============================================================================
---
activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Util/IdGenerator.cs
(original)
+++
activemq/activemq-dotnet/Apache.NMS.Stomp/trunk/src/main/csharp/Util/IdGenerator.cs
Fri Nov 5 21:41:34 2010
@@ -80,9 +80,6 @@ namespace Apache.NMS.Stomp.Util
/// <summary>
/// Generate a Unique Id
/// </summary>
- /// <returns>
- /// A <see cref="String"/>
- /// </returns>
public String GenerateId()
{
lock(UNIQUE_STUB)
@@ -94,9 +91,6 @@ namespace Apache.NMS.Stomp.Util
/// <summary>
/// Generate a unique ID - that is friendly for a URL or file system
/// </summary>
- /// <returns>
- /// A <see cref="String"/>
- /// </returns>
public String GenerateSanitizedId()
{
String result = GenerateId();
@@ -109,12 +103,6 @@ namespace Apache.NMS.Stomp.Util
/// <summary>
/// From a generated id - return the seed (i.e. minus the count)
/// </summary>
- /// <param name="id">
- /// A <see cref="String"/>
- /// </param>
- /// <returns>
- /// A <see cref="String"/>
- /// </returns>
public static String GetSeedFromId(String id)
{
String result = id;
@@ -134,12 +122,6 @@ namespace Apache.NMS.Stomp.Util
/// <summary>
/// From a generated id - return the generator count
/// </summary>
- /// <param name="id">
- /// A <see cref="String"/>
- /// </param>
- /// <returns>
- /// A <see cref="System.Int64"/>
- /// </returns>
public static long GetSequenceFromId(String id)
{
long result = -1;
@@ -159,15 +141,6 @@ namespace Apache.NMS.Stomp.Util
/// <summary>
/// Does a proper compare on the ids
/// </summary>
- /// <param name="id1">
- /// A <see cref="String"/>
- /// </param>
- /// <param name="id2">
- /// A <see cref="String"/>
- /// </param>
- /// <returns>
- /// A <see cref="System.Int32"/>
- /// </returns>
public static int Compare(String id1, String id2)
{
int result = -1;