activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rajdav...@apache.org
Subject svn commit: r552845 - /activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadaptor/TopicSubContainer.java
Date Tue, 03 Jul 2007 14:06:41 GMT
Author: rajdavies
Date: Tue Jul  3 07:06:38 2007
New Revision: 552845

URL: http://svn.apache.org/viewvc?view=rev&rev=552845
Log:
ensure we don't use a batchEntry for an element that's deleted

Modified:
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadaptor/TopicSubContainer.java

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadaptor/TopicSubContainer.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadaptor/TopicSubContainer.java?view=diff&rev=552845&r1=552844&r2=552845
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadaptor/TopicSubContainer.java
(original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadaptor/TopicSubContainer.java
Tue Jul  3 07:06:38 2007
@@ -66,11 +66,11 @@
             while(entry!=null){
                 ConsumerMessageRef ref=(ConsumerMessageRef)listContainer.get(entry);
                 listContainer.remove(entry);
+                if(listContainer!=null&&batchEntry!=null&&(listContainer.isEmpty()||batchEntry.equals(entry))){
+                    reset();
+                }
                 if(ref!=null&&ref.getMessageId().equals(id)){
                     result=ref;
-                    if(listContainer!=null&&batchEntry!=null&&(listContainer.isEmpty()||batchEntry.equals(entry))){
-                        reset();
-                    }
                     break;
                 }
                 entry=listContainer.getFirst();



Mime
View raw message