Return-Path: 
 <commits-return-24661-apmail-activemq-commits-archive=activemq.apache.org@activemq.apache.org>
X-Original-To: apmail-activemq-commits-archive@www.apache.org
Delivered-To: apmail-activemq-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id A3D351045C
	for <apmail-activemq-commits-archive@www.apache.org>;
 Mon,  3 Mar 2014 16:21:14 +0000 (UTC)
Received: (qmail 25695 invoked by uid 500); 3 Mar 2014 16:21:14 -0000
Delivered-To: apmail-activemq-commits-archive@activemq.apache.org
Received: (qmail 25662 invoked by uid 500); 3 Mar 2014 16:21:13 -0000
Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@activemq.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@activemq.apache.org>
List-Post: <mailto:commits@activemq.apache.org>
List-Id: <commits.activemq.apache.org>
Reply-To: dev@activemq.apache.org
Delivered-To: mailing list commits@activemq.apache.org
Received: (qmail 25655 invoked by uid 99); 3 Mar 2014 16:21:13 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 03 Mar 2014 16:21:13 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id 75387933B98; Mon,  3 Mar 2014 16:21:13 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: gtully@apache.org
To: commits@activemq.apache.org
Message-Id: <9fed94770a2b44ef8515ff66c9c10f28@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: git commit: fix build revert extras in MessageDatabase from
 https://git-wip-us.apache.org/repos/asf?p=activemq.git; a=commit;
 h=69c0d399 - sorry
Date: Mon,  3 Mar 2014 16:21:13 +0000 (UTC)

Repository: activemq
Updated Branches:
  refs/heads/trunk 5d511975f -> ab01ae381


fix build revert extras in MessageDatabase from https://git-wip-us.apache.org/repos/asf?p=activemq.git;a=commit;h=69c0d399 - sorry


Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/ab01ae38
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/ab01ae38
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/ab01ae38

Branch: refs/heads/trunk
Commit: ab01ae3818cabc4155e35bc5d18d05066f9f588c
Parents: 5d51197
Author: gtully <gary.tully@gmail.com>
Authored: Mon Mar 3 16:20:21 2014 +0000
Committer: gtully <gary.tully@gmail.com>
Committed: Mon Mar 3 16:20:21 2014 +0000

----------------------------------------------------------------------
 .../activemq/store/kahadb/MessageDatabase.java       | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq/blob/ab01ae38/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java
----------------------------------------------------------------------
diff --git a/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java b/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java
index 78e26a9..b185d69 100644
--- a/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java
+++ b/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java
@@ -2302,7 +2302,6 @@ public abstract class MessageDatabase extends ServiceSupport implements BrokerSe
     @SuppressWarnings("rawtypes")
     protected final LinkedHashMap<TransactionId, List<Operation>> preparedTransactions = new LinkedHashMap<TransactionId, List<Operation>>();
     protected final Set<String> ackedAndPrepared = new HashSet<String>();
-    protected final Set<String> rolledBackAcks = new HashSet<String>();
 
     // messages that have prepared (pending) acks cannot be re-dispatched unless the outcome is rollback,
     // till then they are skipped by the store.
@@ -2318,16 +2317,12 @@ public abstract class MessageDatabase extends ServiceSupport implements BrokerSe
         }
     }
 
-    public void forgetRecoveredAcks(ArrayList<MessageAck> acks, boolean rollback) throws IOException {
+    public void forgetRecoveredAcks(ArrayList<MessageAck> acks) throws IOException {
         if (acks != null) {
             this.indexLock.writeLock().lock();
             try {
                 for (MessageAck ack : acks) {
-                    final String id = ack.getLastMessageId().toProducerKey();
-                    ackedAndPrepared.remove(id);
-                    if (rollback) {
-                        rolledBackAcks.add(id);
-                    }
+                    ackedAndPrepared.remove(ack.getLastMessageId().toProducerKey());
                 }
             } finally {
                 this.indexLock.writeLock().unlock();
@@ -2950,12 +2945,6 @@ public abstract class MessageDatabase extends ServiceSupport implements BrokerSe
             return lastGetPriority;
         }
 
-        public boolean alreadyDispatched(Long sequence) {
-            return (cursor.highPriorityCursorPosition > 0 && cursor.highPriorityCursorPosition >= sequence) ||
-                    (cursor.defaultCursorPosition > 0 && cursor.defaultCursorPosition >= sequence) ||
-                    (cursor.lowPriorityCursorPosition > 0 && cursor.lowPriorityCursorPosition >= sequence);
-        }
-
         class MessageOrderIterator implements Iterator<Entry<Long, MessageKeys>>{
             Iterator<Entry<Long, MessageKeys>>currentIterator;
             final Iterator<Entry<Long, MessageKeys>>highIterator;