You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2017/04/14 22:08:06 UTC
activemq-artemis git commit: ARTEMIS-1114 Improving some comment
[Forced Update!]
Repository: activemq-artemis
Updated Branches:
refs/heads/1.x 3076b84c7 -> 65481ef46 (forced update)
ARTEMIS-1114 Improving some comment
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/65481ef4
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/65481ef4
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/65481ef4
Branch: refs/heads/1.x
Commit: 65481ef46ac6378165e3f02fcee5262df740c951
Parents: ec9615a
Author: Clebert Suconic <cl...@apache.org>
Authored: Fri Apr 14 18:07:09 2017 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Fri Apr 14 18:07:54 2017 -0400
----------------------------------------------------------------------
.../activemq/artemis/core/journal/impl/JournalTransaction.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/65481ef4/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalTransaction.java
----------------------------------------------------------------------
diff --git a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalTransaction.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalTransaction.java
index 36d585a..78887db 100644
--- a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalTransaction.java
+++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalTransaction.java
@@ -232,7 +232,10 @@ public class JournalTransaction {
public void commit(final JournalFile file) {
JournalCompactor compactor = journal.getCompactor();
- // The race lies here....
+ // https://issues.apache.org/jira/browse/ARTEMIS-1114
+ // There was a race once where compacting was not set
+ // because the Journal was missing a readLock and compacting was starting
+ // without setting this properly...
if (compacting && compactor != null) {
if (logger.isTraceEnabled()) {
logger.trace("adding tx " + this.id + " into compacting");