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

3 files changed, 7 insertions, 12 deletions

diff --git a/java/client/src/main/java/org/apache/qpidity/jms/MessageConsumerImpl.java b/java/client/src/main/java/org/apache/qpidity/jms/MessageConsumerImpl.java
index c071280b37..6ea9a328e5 100644
--- a/java/client/src/main/java/org/apache/qpidity/jms/MessageConsumerImpl.java
+++ b/java/client/src/main/java/org/apache/qpidity/jms/MessageConsumerImpl.java
@@ -354,7 +354,8 @@ public class MessageConsumerImpl extends MessageActor implements MessageConsumer
                 // if this consumer is stopped then this will be call when starting
                 getSession().getQpidSession()
                         .messageFlow(getMessageActorID(), org.apache.qpidity.client.Session.MESSAGE_FLOW_UNIT_MESSAGE, 1);
-                received = 0; //getSession().getQpidSession().messageFlush(getMessageActorID());
+                getSession().getQpidSession().messageFlush(getMessageActorID());
+               // received = getSession().getQpidSession().
             }
             if ( received == 0 && timeout < 0)
             {
@@ -381,7 +382,7 @@ public class MessageConsumerImpl extends MessageActor implements MessageConsumer
                 }
                 if (_incomingMessage != null)
                 {
-                    result = _incomingMessage.getJMSMessage();
+                    result = (Message) _incomingMessage;
                     // tell the session that a message is inprocess
                     getSession().preProcessMessage(_incomingMessage);
                     // tell the session to acknowledge this message (if required)
@@ -443,7 +444,7 @@ public class MessageConsumerImpl extends MessageActor implements MessageConsumer
             boolean messageOk = true;
             if (_messageSelector != null)
             {
-                messageOk = _filter.matches(message.getJMSMessage());
+                messageOk = _filter.matches((Message) message);
             }
             if (!messageOk && _preAcquire)
             {
@@ -533,7 +534,7 @@ public class MessageConsumerImpl extends MessageActor implements MessageConsumer
                     **/
                     try
                     {
-                        _messageListener.onMessage(message.getJMSMessage());
+                        _messageListener.onMessage((Message) message);
                     }
                     catch (RuntimeException re)
                     {
diff --git a/java/client/src/main/java/org/apache/qpidity/jms/QpidMessageListener.java b/java/client/src/main/java/org/apache/qpidity/jms/QpidMessageListener.java
index a914dda044..082d38ce21 100644
--- a/java/client/src/main/java/org/apache/qpidity/jms/QpidMessageListener.java
+++ b/java/client/src/main/java/org/apache/qpidity/jms/QpidMessageListener.java
@@ -18,6 +18,7 @@
 package org.apache.qpidity.jms;
 
 import org.apache.qpidity.jms.message.QpidMessage;
+import org.apache.qpidity.jms.message.MessageFactory;
 import org.apache.qpidity.api.Message;
 import org.apache.qpidity.client.MessageListener;
 import org.slf4j.Logger;
@@ -62,7 +63,7 @@ public class QpidMessageListener implements MessageListener
         try
         {
             //convert this message into a JMS one
-            QpidMessage jmsMessage = null; // todo
+            QpidMessage jmsMessage = MessageFactory.getQpidMessage(message);
             // if consumer is asynchronous then send this message to its session.
             if( _consumer.getMessageListener() != null )
             {
diff --git a/java/client/src/main/java/org/apache/qpidity/jms/message/QpidMessage.java b/java/client/src/main/java/org/apache/qpidity/jms/message/QpidMessage.java
index 34d75e1eba..601fd4e0ab 100644
--- a/java/client/src/main/java/org/apache/qpidity/jms/message/QpidMessage.java
+++ b/java/client/src/main/java/org/apache/qpidity/jms/message/QpidMessage.java
@@ -316,7 +316,6 @@ public class QpidMessage
         return _messageData;
     }
 
-
     /**
      * Clear this message data
      */
@@ -325,12 +324,6 @@ public class QpidMessage
         _messageData = ByteBuffer.allocate(1024);        
     }
 
-    public Message getJMSMessage()
-    {
-        // todo
-        return null;
-    }
-
 }