activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dej...@apache.org
Subject svn commit: r1153482 - /activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java
Date Wed, 03 Aug 2011 13:35:36 GMT
Author: dejanb
Date: Wed Aug  3 13:35:35 2011
New Revision: 1153482

URL: http://svn.apache.org/viewvc?rev=1153482&view=rev
Log:
https://issues.apache.org/jira/browse/AMQ-3422 - don't remove journal file with current producer
tracker

Modified:
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java?rev=1153482&r1=1153481&r2=1153482&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java
(original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java
Wed Aug  3 13:35:35 2011
@@ -1178,12 +1178,15 @@ public class MessageDatabase extends Ser
                 gcCandidateSet.removeAll(journalFilesBeingReplicated);
             }
 
+            if (metadata.producerSequenceIdTrackerLocation != null) {
+                gcCandidateSet.remove(metadata.producerSequenceIdTrackerLocation.getDataFileId());
+            }
+
             // Don't GC files after the first in progress tx
             if (metadata.firstInProgressTransactionLocation != null) {
                 if (metadata.firstInProgressTransactionLocation.getDataFileId() < firstTxLocation.getDataFileId())
{
                     firstTxLocation = metadata.firstInProgressTransactionLocation;
                 }
-                ;
             }
 
             if (firstTxLocation != null) {



Mime
View raw message