Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Properly handle a rollback() when call from an onMessaqge() 

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@394851 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Hiram R. Chirino 2006-04-18 05:50:40 +00:00
parent 535c30c3e8
commit b708fd32c3
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java
View File

@ -602,10 +602,14 @@ public class ActiveMQMessageConsumer implements MessageAvailableConsumer, StatsC
this.info.setCurrentPrefetchSize(prefetch);
}
private void beforeMessageIsConsumed(MessageDispatch md) {
private void beforeMessageIsConsumed(MessageDispatch md) throws JMSException {
md.setDeliverySequenceId(session.getNextDeliveryId());
if (!session.isDupsOkAcknowledge())
if (!session.isDupsOkAcknowledge()) {
deliveredMessages.addFirst(md);
if( session.isTransacted() ) {
ackLater(md,MessageAck.DELIVERED_ACK_TYPE);
}
}
}
private void afterMessageIsConsumed(MessageDispatch md,boolean messageExpired) throws JMSException{
@ -615,9 +619,8 @@ public class ActiveMQMessageConsumer implements MessageAvailableConsumer, StatsC
ackLater(md,MessageAck.DELIVERED_ACK_TYPE);
}else{
stats.onMessage();
if(session.isTransacted()){
ackLater(md,MessageAck.DELIVERED_ACK_TYPE);
}else if(session.isAutoAcknowledge()){
if( session.isTransacted() ) {
} else if(session.isAutoAcknowledge()) {
if(!deliveredMessages.isEmpty()){
if(optimizeAcknowledge){
if(deliveryingAcknowledgements.compareAndSet(false,true)){
@ -636,11 +639,11 @@ public class ActiveMQMessageConsumer implements MessageAvailableConsumer, StatsC
deliveredMessages.clear();
}
}
}else if(session.isDupsOkAcknowledge()){
} else if(session.isDupsOkAcknowledge()){
ackLater(md,MessageAck.STANDARD_ACK_TYPE);
}else if(session.isClientAcknowledge()){
} else if(session.isClientAcknowledge()){
ackLater(md,MessageAck.DELIVERED_ACK_TYPE);
}else{
} else{
throw new IllegalStateException("Invalid session state.");
}
}