changed for accepting messages from python and c++

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

2 files changed, 32 insertions, 18 deletions

diff --git a/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/Consumer.java b/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/Consumer.java
index 86835da1ba..752925f63b 100644
--- a/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/Consumer.java
+++ b/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/Consumer.java
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-package  org.apache.qpid.example.jmsexample.direct;
+package org.apache.qpid.example.jmsexample.direct;
 
 import org.apache.qpid.example.jmsexample.common.BaseExample;
 
@@ -110,18 +110,25 @@ public class Consumer extends BaseExample
             while (!end)
             {
                 message = messageConsumer.receive();
+                String text = "";
                 if (message instanceof TextMessage)
                 {
-                    System.out.println(CLASS + ": Received  message:  " + ((TextMessage) message).getText());
-                    if (((TextMessage) message).getText().equals("That's all, folks!"))
-                    {
-                        System.out.println(CLASS + ": Received final message for " + _queueName);
-                        end = true;
-                    }
+                    text = ((TextMessage) message).getText();
                 }
                 else
                 {
-                    System.out.println(CLASS + ": Received messages is  not a text message");
+                    byte[] body = new byte[(int) ((BytesMessage) message).getBodyLength()]; 
+                    ((BytesMessage) message).readBytes(body);
+                    text = new String(body);
+                }
+                if (text.equals("That's all, folks!"))
+                {
+                    System.out.println(CLASS + ": Received final message for " + _queueName);
+                    end = true;
+                }
+                else
+                {
+                    System.out.println(CLASS + ": Received  message:  " + text);
                 }
             }
 
diff --git a/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/Listener.java b/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/Listener.java
index 7883556b67..29873a7529 100644
--- a/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/Listener.java
+++ b/java/client/example/src/main/java/org/apache/qpid/example/jmsexample/direct/Listener.java
@@ -109,7 +109,7 @@ public class Listener extends BaseExample implements MessageListener
             Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
 
             // lookup the queue
-            Queue destination =  session.createQueue(_queueName);
+            Queue destination = session.createQueue(_queueName);
 
             // Create a MessageConsumer
             System.out.println(CLASS + ": Creating a MessageConsumer");
@@ -164,22 +164,29 @@ public class Listener extends BaseExample implements MessageListener
     {
         try
         {
+            String text = "";
             if (message instanceof TextMessage)
             {
-                System.out.println(CLASS + ": Received message: " + ((TextMessage) message).getText());
-                if (((TextMessage) message).getText().equals("That's all, folks!"))
+                text = ((TextMessage) message).getText();
+            }
+            else
+            {
+                byte[] body = new byte[(int) ((BytesMessage) message).getBodyLength()];
+                ((BytesMessage) message).readBytes(body);
+                text = new String(body);
+            }
+            if (text.equals("That's all, folks!"))
+            {
+                System.out.println(CLASS + ": Received final message for " + _queueName);
+                synchronized (_lock)
                 {
-                    System.out.println(CLASS + ": Shutting down listener for " + _queueName);
-                    synchronized (_lock)
-                    {
-                        _finished = true;
-                        _lock.notifyAll();
-                    }
+                    _finished = true;
+                    _lock.notifyAll();
                 }
             }
             else
             {
-                System.out.println(" [not text message]");
+                System.out.println(CLASS + ": Received  message:  " + text);
             }
         }
         catch (JMSException exp)