2008-12-20 Michael Barker <mike@middlesoft.co.uk>

	* MessageQueue.cs:  Added implementation for async methods: BeginReceive,
	BeginPeek, EndReceive and EndPeek.  Set up event handlers to propagate
	Asycn ReceiveCompleted/PeekCompleted events to System.Messaging API users.

svn path=/trunk/mcs/; revision=122082

diff --git a/mcs/class/System.Messaging/System.Messaging/ChangeLog b/mcs/class/System.Messaging/System.Messaging/ChangeLog
index 657588ebdd3e90bfb6c13c23fe8f08e31b47f63a..dd0a6207bc7cec28760a64d850d51f881e1a8b44 100644 (file)
--- a/mcs/class/System.Messaging/System.Messaging/ChangeLog
+++ b/mcs/class/System.Messaging/System.Messaging/ChangeLog
@@ -1,3 +1,9 @@
+2008-12-20  Michael Barker  <mike@middlesoft.co.uk>
+
+       * MessageQueue.cs:  Added implementation for async methods: BeginReceive,
+       BeginPeek, EndReceive and EndPeek.  Set up event handlers to propagate
+       Asycn ReceiveCompleted/PeekCompleted events to System.Messaging API users.
+       
 2008-11-23  Michael Barker  <mike@middlesoft.co.uk>
 
        * MessageQueue.cs:  Added support for MessageQueueTransactionType methods, 

diff --git a/mcs/class/System.Messaging/System.Messaging/MessageQueue.cs b/mcs/class/System.Messaging/System.Messaging/MessageQueue.cs
index 61918a526af84e1adc8d7bc749b4d2e624360b2f..1d14e5a4de2ff64f93fb3673c103261ece53fde5 100644 (file)
--- a/mcs/class/System.Messaging/System.Messaging/MessageQueue.cs
+++ b/mcs/class/System.Messaging/System.Messaging/MessageQueue.cs
@@ -34,6 +34,7 @@ using System.Collections;
 using System.ComponentModel;
 using System.Drawing;
 using System.Messaging.Design;
+using System.Threading;
 
 using Mono.Messaging;
 
@@ -49,7 +50,7 @@ namespace System.Messaging
                #region Fields
 
                public static readonly long InfiniteQueueSize;
-               public static readonly TimeSpan InfiniteTimeout;
+               public static readonly TimeSpan InfiniteTimeout = MessagingProviderLocator.InfiniteTimeout;
                private IMessageFormatter formatter;
                private MessagePropertyFilter messageReadPropertyFilter = new MessagePropertyFilter ();
                private readonly IMessageQueue delegateQueue;
@@ -76,6 +77,7 @@ namespace System.Messaging
                {
                        this.delegateQueue = delegateQueue;
                        formatter = new XmlMessageFormatter ();
+                       delegateQueue.PeekCompleted += new CompletedEventHandler (DelegatePeekCompleted);
                }
 
                #endregion //Constructor
@@ -372,47 +374,46 @@ namespace System.Messaging
 
                #region Methods
 
-               [MonoTODO]
                public IAsyncResult BeginPeek ()
                {
-                       throw new NotImplementedException ();
+                       return delegateQueue.BeginPeek ();
                }
-               [MonoTODO]
+
                public IAsyncResult BeginPeek (TimeSpan timeout)
                {
-                       throw new NotImplementedException ();
+                       return delegateQueue.BeginPeek (timeout);
                }
-               [MonoTODO]
+
                public IAsyncResult BeginPeek (TimeSpan timeout, object stateObject)
                {
-                       throw new NotImplementedException ();
+                       return delegateQueue.BeginPeek (timeout, stateObject);
                }
-               [MonoTODO]
+
                public IAsyncResult BeginPeek (TimeSpan timeout,
                                                                          object stateObject,
                                                                          AsyncCallback callback)
                {
-                       throw new NotImplementedException ();
-               }
-               [MonoTODO]
+                       return delegateQueue.BeginPeek (timeout, stateObject, callback);
+               }               
+
                public IAsyncResult BeginReceive ()
                {
-                       throw new NotImplementedException ();
+                       return delegateQueue.BeginReceive ();
                }
-               [MonoTODO]
+
                public IAsyncResult BeginReceive (TimeSpan timeout)
                {
-                       throw new NotImplementedException ();
+                       return delegateQueue.BeginReceive (timeout);
                }
-               [MonoTODO]
+
                public IAsyncResult BeginReceive (TimeSpan timeout, object stateObject)
                {
-                       throw new NotImplementedException ();
+                       return delegateQueue.BeginReceive (timeout, stateObject);
                }
-               [MonoTODO]
+
                public IAsyncResult BeginReceive (TimeSpan timeout, object stateObject, AsyncCallback callback)
                {
-                       throw new NotImplementedException ();
+                       return delegateQueue.BeginReceive (timeout, stateObject, callback);
                }
                [MonoTODO]
                public static void ClearConnectionCache ()
@@ -445,15 +446,47 @@ namespace System.Messaging
                        QueueReference qRef = QueueReference.Parse (path);
                        MessagingProviderLocator.GetProvider ().DeleteQueue (qRef);
                }
-               [MonoTODO]
+
                public Message EndPeek (IAsyncResult asyncResult)
                {
-                       throw new NotImplementedException ();
+                       if (asyncResult == null)
+                               throw new ArgumentNullException ();
+                       
+                       try {                           
+                               IMessage iMsg = delegateQueue.EndPeek (asyncResult);
+                               if (iMsg == null)
+                                       return null;
+                               
+                               return new Message (iMsg, null, Formatter);
+                               
+                       } catch (ConnectionException e) {
+                               throw new MessageQueueException (MessageQueueErrorCode.QueueNotAvailable, e.Message);
+                       } catch (MessageUnavailableException e) {
+                               throw new InvalidOperationException (e.Message, e);
+                       } catch (MonoMessagingException e) {
+                               throw new MessageQueueException (MessageQueueErrorCode.Generic, e.Message);
+                       }
                }
-               [MonoTODO]
+               
                public Message EndReceive (IAsyncResult asyncResult)
                {
-                       throw new NotImplementedException ();
+                       if (asyncResult == null)
+                               throw new ArgumentNullException ();
+                       
+                       try {                           
+                               IMessage iMsg = delegateQueue.EndReceive (asyncResult);
+                               if (iMsg == null)
+                                       return null;
+                               
+                               return new Message (iMsg, null, Formatter);
+                               
+                       } catch (ConnectionException e) {
+                               throw new MessageQueueException (MessageQueueErrorCode.QueueNotAvailable, e.Message);
+                       } catch (MessageUnavailableException e) {
+                               throw new InvalidOperationException (e.Message, e);
+                       } catch (MonoMessagingException e) {
+                               throw new MessageQueueException (MessageQueueErrorCode.Generic, e.Message);
+                       }
                }
 
                public static bool Exists (string path)
@@ -1120,14 +1153,30 @@ namespace System.Messaging
 
                #endregion //Methods
 
-               //TODO: Use these events.
-
                [MessagingDescription ("MQ_PeekCompleted")]
                public event PeekCompletedEventHandler PeekCompleted;
+               
+               private void DelegatePeekCompleted (object sender, CompletedEventArgs args)
+               {
+                       if (PeekCompleted == null)
+                               return;
+                       
+                       PeekCompletedEventArgs newArgs = new PeekCompletedEventArgs (this, args.AsyncResult);                   
+                       PeekCompleted (sender, newArgs);
+               }
 
                [MessagingDescription ("MQ_ReceiveCompleted")]
                public event ReceiveCompletedEventHandler ReceiveCompleted;
                
+               private void DelegateReceiveCompleted (object sender, CompletedEventArgs args)
+               {
+                       if (ReceiveCompleted == null)
+                               return;
+                       
+                       ReceiveCompletedEventArgs newArgs = new ReceiveCompletedEventArgs (this, args.AsyncResult);                     
+                       ReceiveCompleted (sender, newArgs);
+               }
+               
                private static IMessageQueue GetMessageQueue (string path)
                {
                        QueueReference qRef = QueueReference.Parse (path);
@@ -1153,6 +1202,6 @@ namespace System.Messaging
                private static bool Exists (QueueReference qRef)
                {
                        return MessagingProviderLocator.GetProvider ().Exists (qRef);
-               }
+               }               
        }
 }