You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ar...@apache.org on 2007/08/13 18:26:38 UTC
svn commit: r565401 - in
/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms:
MessageConsumerImpl.java QpidMessageListener.java message/QpidMessage.java
Author: arnaudsimon
Date: Mon Aug 13 09:26:37 2007
New Revision: 565401
URL: http://svn.apache.org/viewvc?view=rev&rev=565401
Log: (empty)
Modified:
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/MessageConsumerImpl.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/QpidMessageListener.java
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/message/QpidMessage.java
Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/MessageConsumerImpl.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/MessageConsumerImpl.java?view=diff&rev=565401&r1=565400&r2=565401
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/MessageConsumerImpl.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/MessageConsumerImpl.java Mon Aug 13 09:26:37 2007
@@ -354,7 +354,8 @@
// 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 @@
}
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 @@
boolean messageOk = true;
if (_messageSelector != null)
{
- messageOk = _filter.matches(message.getJMSMessage());
+ messageOk = _filter.matches((Message) message);
}
if (!messageOk && _preAcquire)
{
@@ -533,7 +534,7 @@
**/
try
{
- _messageListener.onMessage(message.getJMSMessage());
+ _messageListener.onMessage((Message) message);
}
catch (RuntimeException re)
{
Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/QpidMessageListener.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/QpidMessageListener.java?view=diff&rev=565401&r1=565400&r2=565401
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/QpidMessageListener.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/QpidMessageListener.java Mon Aug 13 09:26:37 2007
@@ -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 @@
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 )
{
Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/message/QpidMessage.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/message/QpidMessage.java?view=diff&rev=565401&r1=565400&r2=565401
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/message/QpidMessage.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/jms/message/QpidMessage.java Mon Aug 13 09:26:37 2007
@@ -316,19 +316,12 @@
return _messageData;
}
-
/**
* Clear this message data
*/
protected void clearMessageData()
{
_messageData = ByteBuffer.allocate(1024);
- }
-
- public Message getJMSMessage()
- {
- // todo
- return null;
}
}