activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gtu...@apache.org
Subject svn commit: r1378542 - in /activemq/trunk/activemq-core/src: main/java/org/apache/activemq/broker/region/cursors/AbstractStoreCursor.java test/java/org/apache/activemq/usecases/JdbcDurableSubDupTest.java
Date Wed, 29 Aug 2012 13:30:05 GMT
Author: gtully
Date: Wed Aug 29 13:30:04 2012
New Revision: 1378542

URL: http://svn.apache.org/viewvc?rev=1378542&view=rev
Log:
https://issues.apache.org/jira/browse/AMQ-3998 https://issues.apache.org/jira/browse/AMQ-3999
- fix regression in org.apache.activemq.bugs.AMQ3934Test - resetting batch too eagerly in
old behaviour results in picking up deleted message

Modified:
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/AbstractStoreCursor.java
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/JdbcDurableSubDupTest.java

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/AbstractStoreCursor.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/AbstractStoreCursor.java?rev=1378542&r1=1378541&r2=1378542&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/AbstractStoreCursor.java
(original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/AbstractStoreCursor.java
Wed Aug 29 13:30:04 2012
@@ -34,7 +34,7 @@ public abstract class AbstractStoreCurso
     protected final Destination regionDestination;
     protected final PendingList batchList;
     private Iterator<MessageReference> iterator = null;
-    protected boolean batchResetNeeded = true;
+    protected boolean batchResetNeeded = false;
     private boolean storeHasMessages = false;
     protected int size;
     private MessageId lastCachedId;
@@ -53,8 +53,7 @@ public abstract class AbstractStoreCurso
     
     public final synchronized void start() throws Exception{
         if (!isStarted()) {
-            clear();
-            super.start();      
+            super.start();
             resetBatch();
             resetSize();
             setCacheEnabled(!this.storeHasMessages&&useCache);

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/JdbcDurableSubDupTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/JdbcDurableSubDupTest.java?rev=1378542&r1=1378541&r2=1378542&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/JdbcDurableSubDupTest.java
(original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/JdbcDurableSubDupTest.java
Wed Aug 29 13:30:04 2012
@@ -77,7 +77,7 @@ public class JdbcDurableSubDupTest {
         broker.setAdvisorySupport(false);
         broker.setPersistenceAdapter(new JDBCPersistenceAdapter());
         PolicyEntry policyEntry = new PolicyEntry();
-        policyEntry.setMaxAuditDepth(2000);
+        policyEntry.setMaxAuditDepth(3000);
         policyEntry.setMaxPageSize(150);
         policyEntry.setPrioritizedMessages(true);
         PolicyMap policyMap = new PolicyMap();



Mime
View raw message