Author: rajdavies
Date: Fri Dec 29 12:25:58 2006
New Revision: 491092

URL: http://svn.apache.org/viewvc?view=rev&rev=491092
Log:
clear batch entry if no more messages in the container

Modified:
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadaptor/KahaMessageStore.java
    incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/rapid/RapidMessageStore.java

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadaptor/KahaMessageStore.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadaptor/KahaMessageStore.java?view=diff&rev=491092&r1=491091&r2=491092
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadaptor/KahaMessageStore.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadaptor/KahaMessageStore.java Fri Dec 29 12:25:58 2006
@@ -122,7 +122,7 @@
             }
         }
         if (messageContainer.isEmpty()) {
-            batchEntry = null;
+            resetBatching();
         }
     }
 

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/rapid/RapidMessageStore.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/rapid/RapidMessageStore.java?view=diff&rev=491092&r1=491091&r2=491092
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/rapid/RapidMessageStore.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/rapid/RapidMessageStore.java Fri Dec 29 12:25:58 2006
@@ -216,6 +216,9 @@
                 }
             }
         }
+        if (messageContainer.isEmpty()) {
+            resetBatching();
+        }
     }
     
     public void replayRemoveMessage(ConnectionContext context, MessageAck ack) {