activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rajdav...@apache.org
Subject svn commit: r663980 - /activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/AbstractRegion.java
Date Fri, 06 Jun 2008 15:21:17 GMT
Author: rajdavies
Date: Fri Jun  6 08:21:17 2008
New Revision: 663980

URL: http://svn.apache.org/viewvc?rev=663980&view=rev
Log:
Fix for https://issues.apache.org/activemq/browse/AMQ-1712

Modified:
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/AbstractRegion.java

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/AbstractRegion.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/AbstractRegion.java?rev=663980&r1=663979&r2=663980&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/AbstractRegion.java
(original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/AbstractRegion.java
Fri Jun  6 08:21:17 2008
@@ -353,9 +353,13 @@
             if (sub == null) {
                 //networked subscriptions are going to acknowledge in flight messages 
                 //on behalf a subscription that is no more ...
-                if (!consumerExchange.getConnectionContext().isNetworkConnection()) {
-                    throw new IllegalArgumentException("The subscription does not exist:
" + ack.getConsumerId());
-                }else {
+                if (!consumerExchange.getConnectionContext().isNetworkConnection()
+                     && !consumerExchange.getConnectionContext()
+                                .isInRecoveryMode()) {
+                    throw new IllegalArgumentException(
+                            "The subscription does not exist: "
+                                    + ack.getConsumerId());
+                } else {
                     return;
                 }
             }



Mime
View raw message