You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ra...@apache.org on 2008/07/14 17:04:36 UTC
svn commit: r676613 - in
/incubator/qpid/branches/qpid.0-10/java/client/src/main/java/org/apache/qpid/client:
BasicMessageConsumer.java BasicMessageConsumer_0_10.java
Author: rajith
Date: Mon Jul 14 08:04:34 2008
New Revision: 676613
URL: http://svn.apache.org/viewvc?rev=676613&view=rev
Log:
This is related to QPID-1163.
This is already in trunk and I am porting it to the qpid.0-10 branch.
Modified:
incubator/qpid/branches/qpid.0-10/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java
incubator/qpid/branches/qpid.0-10/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_10.java
Modified: incubator/qpid/branches/qpid.0-10/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-10/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java?rev=676613&r1=676612&r2=676613&view=diff
==============================================================================
--- incubator/qpid/branches/qpid.0-10/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java (original)
+++ incubator/qpid/branches/qpid.0-10/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java Mon Jul 14 08:04:34 2008
@@ -290,6 +290,7 @@
}
_session.setInRecovery(false);
+ preDeliver(jmsMsg);
}
/**
@@ -642,7 +643,7 @@
// if (!_closed.get())
{
- preDeliver(jmsMessage);
+ //preDeliver(jmsMessage);
notifyMessage(jmsMessage);
}
@@ -724,6 +725,17 @@
// to send out the appropriate frame
msg.setAMQSession(_session);
break;
+ case Session.SESSION_TRANSACTED:
+ if (isNoConsume())
+ {
+ _session.acknowledgeMessage(msg.getDeliveryTag(), false);
+ }
+ else
+ {
+ _session.addDeliveredMessage(msg.getDeliveryTag());
+ }
+
+ break;
}
}
@@ -750,17 +762,6 @@
}
break;
- case Session.SESSION_TRANSACTED:
- if (isNoConsume())
- {
- _session.acknowledgeMessage(msg.getDeliveryTag(), false);
- }
- else
- {
- _session.addDeliveredMessage(msg.getDeliveryTag());
- }
-
- break;
}
}
Modified: incubator/qpid/branches/qpid.0-10/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_10.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-10/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_10.java?rev=676613&r1=676612&r2=676613&view=diff
==============================================================================
--- incubator/qpid/branches/qpid.0-10/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_10.java (original)
+++ incubator/qpid/branches/qpid.0-10/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_10.java Mon Jul 14 08:04:34 2008
@@ -261,11 +261,11 @@
@Override protected void preApplicationProcessing(AbstractJMSMessage jmsMsg) throws JMSException
{
- if (!_session.getTransacted())
+ super.preApplicationProcessing(jmsMsg);
+ if (!_session.getTransacted() && _session.getAcknowledgeMode() != org.apache.qpid.jms.Session.CLIENT_ACKNOWLEDGE)
{
_session.addUnacknowledgedMessage(jmsMsg.getDeliveryTag());
}
- _session.setInRecovery(false);
}
@Override public AbstractJMSMessage createJMSMessageFromUnprocessedMessage(