qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@apache.org
Subject svn commit: r651431 - /incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_10.java
Date Thu, 24 Apr 2008 21:37:04 GMT
Author: rhs
Date: Thu Apr 24 14:37:00 2008
New Revision: 651431

URL: http://svn.apache.org/viewvc?rev=651431&view=rev
Log:
QPID-832: fixed merge artifact affecting replyTo

Modified:
    incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_10.java

Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_10.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_10.java?rev=651431&r1=651430&r2=651431&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_10.java
(original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_10.java
Thu Apr 24 14:37:00 2008
@@ -117,7 +117,7 @@
      * @param jmsMessage this message has already been processed so can't redo preDeliver
      * @param channelId
      */
-    public void notifyMessage(AbstractJMSMessage jmsMessage)
+    @Override public void notifyMessage(AbstractJMSMessage jmsMessage)
     {
         boolean messageOk = false;
         try
@@ -195,9 +195,7 @@
         {
             // <exch_class>://<exch_name>/[<destination>]/[<queue>]?<option>='<value>'[,<option>='<value>']*
             // the exchnage class will be set later from within the sesion thread
-            String replyToUrl =  message.getMessageProperties().getReplyTo()
-                    .getExchange() + "/" + message.getMessageProperties().getReplyTo()
-                    .getRoutingKey() + "/" + message.getMessageProperties().getReplyTo().getRoutingKey();
+            String replyToUrl =  replyTo.getExchange() + "/" + replyTo.getRoutingKey() +
"/" + replyTo.getRoutingKey();
             newMessage.setReplyToURL(replyToUrl);
         }
         newMessage.setContentHeader(headers);
@@ -211,7 +209,7 @@
      * This method is invoked when this consumer is stopped.
      * It tells the broker to stop delivering messages to this consumer.
      */
-    void sendCancel() throws AMQException
+    @Override void sendCancel() throws AMQException
     {
         ((AMQSession_0_10) getSession()).getQpidSession().messageCancel(getConsumerTag().toString());
         ((AMQSession_0_10) getSession()).getQpidSession().sync();
@@ -220,7 +218,7 @@
         ((AMQSession_0_10) getSession()).getCurrentException();
     }
 
-    void notifyMessage(UnprocessedMessage messageFrame, int channelId)
+    @Override void notifyMessage(UnprocessedMessage messageFrame)
     {
         // if there is a replyto destination then we need to request the exchange info
         String replyToURL = messageFrame.getReplyToURL();
@@ -257,13 +255,13 @@
         super.notifyMessage(messageFrame);
     }
 
-    protected void preApplicationProcessing(AbstractJMSMessage jmsMsg) throws JMSException
+    @Override protected void preApplicationProcessing(AbstractJMSMessage jmsMsg) throws JMSException
     {
         _session.addUnacknowledgedMessage(jmsMsg.getDeliveryTag());
         _session.setInRecovery(false);
     }
 
-    public AbstractJMSMessage createJMSMessageFromUnprocessedMessage(
+    @Override public AbstractJMSMessage createJMSMessageFromUnprocessedMessage(
             UnprocessedMessage<Struct[], ByteBuffer> messageFrame) throws Exception
     {
         return _messageFactory.createMessage(messageFrame.getDeliveryTag(), messageFrame.isRedelivered(),
@@ -378,11 +376,6 @@
             _0_10session.getQpidSession().messageRelease(ranges);
             _0_10session.getCurrentException();
         }
-    }
-
-    protected void rollbackReceivedMessages()
-    {
-        // do nothing as the rollback operation will do the job.
     }
 
     /**



Mime
View raw message