QPID-2798 - C++ Messaging Client .NET binding fails to clone managed objects correctly

Patch from Chuck Rolke

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@987510 13f79535-47bb-0310-9956-ffa450edef68

3 files changed, 13 insertions, 7 deletions

diff --git a/cpp/bindings/qpid/dotnet/examples/csharp.example.drain/csharp.example.drain.cs b/cpp/bindings/qpid/dotnet/examples/csharp.example.drain/csharp.example.drain.cs
index 2d763a306d..dc38590f0a 100644
--- a/cpp/bindings/qpid/dotnet/examples/csharp.example.drain/csharp.example.drain.cs
+++ b/cpp/bindings/qpid/dotnet/examples/csharp.example.drain/csharp.example.drain.cs
@@ -43,8 +43,9 @@ namespace Org.Apache.Qpid.Messaging.Examples {
                 Duration timeout = options.Forever ? 

                                    DurationConstants.FORVER : 

                                    DurationConstants.SECOND * options.Timeout;

-                Message message = new Message();

-                while (receiver.Fetch(message, timeout))

+                Message message;

+

+                while ((message = receiver.Fetch(timeout)) != null)

                 {

                     Dictionary<string, object> properties = new Dictionary<string, object>();

                     properties = message.Properties;

diff --git a/cpp/bindings/qpid/dotnet/examples/csharp.map.receiver/csharp.map.recevier.cs b/cpp/bindings/qpid/dotnet/examples/csharp.map.receiver/csharp.map.recevier.cs
index 242944be92..a3b13e2dcd 100644
--- a/cpp/bindings/qpid/dotnet/examples/csharp.map.receiver/csharp.map.recevier.cs
+++ b/cpp/bindings/qpid/dotnet/examples/csharp.map.receiver/csharp.map.recevier.cs
@@ -35,8 +35,11 @@ namespace Org.Apache.Qpid.Messaging.examples
         static void Main(string[] args)

         {

             string url = "amqp:tcp:localhost:5672";

+            string address = "message_queue; {create: always}";

             if (args.Length > 0)

                 url = args[0];

+            if (args.Length > 1)

+                address = args[1];

 

             //

             // Create and open an AMQP connection to the broker URL

@@ -49,7 +52,7 @@ namespace Org.Apache.Qpid.Messaging.examples
             // routing key "map_example".

             //

             Session session = connection.CreateSession();

-            Receiver receiver = session.CreateReceiver("amq.direct/map_example");

+            Receiver receiver = session.CreateReceiver(address);

 

             //

             // Fetch the message from the broker

@@ -61,7 +64,7 @@ namespace Org.Apache.Qpid.Messaging.examples
             //

             Dictionary<string, object> content = new Dictionary<string, object>();

             message.GetContent(content);

-            Console.WriteLine("Received: {0}", message.AsString(content));

+            Console.WriteLine("{0}", message.AsString(content));

 

             //

             // Acknowledge the receipt of all received messages.

diff --git a/cpp/bindings/qpid/dotnet/examples/csharp.map.sender/csharp.map.sender.cs b/cpp/bindings/qpid/dotnet/examples/csharp.map.sender/csharp.map.sender.cs
index 0763b7455e..c35ddf12f0 100644
--- a/cpp/bindings/qpid/dotnet/examples/csharp.map.sender/csharp.map.sender.cs
+++ b/cpp/bindings/qpid/dotnet/examples/csharp.map.sender/csharp.map.sender.cs
@@ -39,8 +39,11 @@ namespace Org.Apache.Qpid.Messaging.examples
         static void Main(string[] args)

         {

             string url = "amqp:tcp:localhost:5672";

+            string address = "message_queue; {create: always}";

             if (args.Length > 0)

                 url = args[0];

+            if (args.Length > 1)

+                address = args[1];

 

             //

             // Create and open an AMQP connection to the broker URL

@@ -49,11 +52,10 @@ namespace Org.Apache.Qpid.Messaging.examples
             connection.Open();

 

             //

-            // Create a session and a sender to the direct exchange using the

-            // routing key "map_example".

+            // Create a session and a sender to the direct exchange

             //

             Session session = connection.CreateSession();

-            Sender sender = session.CreateSender("amq.direct/map_example");

+            Sender sender = session.CreateSender(address);

 

             //

             // Create structured content for the message.  This example builds a