You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ta...@apache.org on 2016/10/26 17:27:44 UTC
activemq git commit: https://issues.apache.org/jira/browse/AMQ-6483
Repository: activemq
Updated Branches:
refs/heads/master 7c3bb4010 -> 1a91decf9
https://issues.apache.org/jira/browse/AMQ-6483
Fix conversion from long to int and back to long again.
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/1a91decf
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/1a91decf
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/1a91decf
Branch: refs/heads/master
Commit: 1a91decf9f6dd7305dd91ae6769df78cc4758c82
Parents: 7c3bb40
Author: Timothy Bish <ta...@gmail.com>
Authored: Wed Oct 26 13:27:24 2016 -0400
Committer: Timothy Bish <ta...@gmail.com>
Committed: Wed Oct 26 13:27:24 2016 -0400
----------------------------------------------------------------------
.../java/org/apache/activemq/store/kahadb/KahaDBStore.java | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq/blob/1a91decf/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/KahaDBStore.java
----------------------------------------------------------------------
diff --git a/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/KahaDBStore.java b/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/KahaDBStore.java
index 66d616b..b4f6c6f 100644
--- a/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/KahaDBStore.java
+++ b/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/KahaDBStore.java
@@ -936,17 +936,17 @@ public class KahaDBStore extends MessageDatabase implements PersistenceAdapter,
} else {
indexLock.writeLock().lock();
try {
- return pageFile.tx().execute(new Transaction.CallableClosure<Integer, IOException>() {
+ return pageFile.tx().execute(new Transaction.CallableClosure<Long, IOException>() {
@Override
- public Integer execute(Transaction tx) throws IOException {
+ public Long execute(Transaction tx) throws IOException {
StoredDestination sd = getStoredDestination(dest, tx);
LastAck cursorPos = getLastAck(tx, sd, subscriptionKey);
if (cursorPos == null) {
// The subscription might not exist.
- return 0;
+ return 0l;
}
- return (int) getStoredMessageSize(tx, sd, subscriptionKey);
+ return getStoredMessageSize(tx, sd, subscriptionKey);
}
});
} finally {
@@ -955,7 +955,6 @@ public class KahaDBStore extends MessageDatabase implements PersistenceAdapter,
}
}
-
protected void recoverMessageStoreSubMetrics() throws IOException {
if (isEnableSubscriptionStatistics()) {