bookkeeper-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From eolive...@apache.org
Subject bookkeeper git commit: BOOKKEEPER-1088: CompactionTest tests are broken because of
Date Sat, 10 Jun 2017 11:55:52 GMT
Repository: bookkeeper
Updated Branches:
  refs/heads/master 58b92de8b -> 13c5c88f6


BOOKKEEPER-1088: CompactionTest tests are broken because of

Problem:

5fe86525a9c823f79b3e97fd82ea4aa1c75c79eb this commit broken the master. It is because the
merge/rebase introduce duplicated lines

Solution:

This change is to remove the duplicated lines introduced at 5fe86525a9c823f79b3e97fd82ea4aa1c75c79eb

Author: Sijie Guo <sijie@apache.org>

Reviewers: Enrico Olivelli <eolivelli@apache.org>

Closes #187 from sijie/sijie/fix_merge_issue


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

Branch: refs/heads/master
Commit: 13c5c88f63f4b7faa63c8c7e42d95f94c6a8d204
Parents: 58b92de
Author: Sijie Guo <sijie@apache.org>
Authored: Sat Jun 10 13:55:37 2017 +0200
Committer: Enrico Olivelli <eolivelli@apache.org>
Committed: Sat Jun 10 13:55:37 2017 +0200

----------------------------------------------------------------------
 .../main/java/org/apache/bookkeeper/client/PendingReadOp.java   | 5 -----
 1 file changed, 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/bookkeeper/blob/13c5c88f/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/PendingReadOp.java
----------------------------------------------------------------------
diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/PendingReadOp.java
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/PendingReadOp.java
index 6f97b9b..a13eb21 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/PendingReadOp.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/PendingReadOp.java
@@ -541,11 +541,6 @@ class PendingReadOp implements Enumeration<LedgerEntry>, ReadEntryCallback
{
             return;
         }
 
-        // ensure callback once
-        if (!complete.compareAndSet(false, true)) {
-            return;
-        }
-
         long latencyNanos = MathUtils.elapsedNanos(requestTimeNanos);
         if (code != BKException.Code.OK) {
             long firstUnread = LedgerHandle.INVALID_ENTRY_ID;


Mime
View raw message