bookkeeper-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From si...@apache.org
Subject bookkeeper git commit: BOOKKEEPER-854: NPE on InterleavedLedgerStorage.onRotateEntryLog (sijie)
Date Wed, 20 May 2015 04:17:17 GMT
Repository: bookkeeper
Updated Branches:
  refs/heads/master 5bd2edbf8 -> 1387b2be4


BOOKKEEPER-854: NPE on InterleavedLedgerStorage.onRotateEntryLog (sijie)


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

Branch: refs/heads/master
Commit: 1387b2be44686abfe78bf4efee4ad52d2d699e12
Parents: 5bd2edb
Author: Sijie Guo <sijie@apache.org>
Authored: Tue May 19 21:15:45 2015 -0700
Committer: Sijie Guo <sijie@apache.org>
Committed: Tue May 19 21:15:45 2015 -0700

----------------------------------------------------------------------
 CHANGES.txt                                                        | 2 ++
 .../java/org/apache/bookkeeper/bookie/SortedLedgerStorage.java     | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/bookkeeper/blob/1387b2be/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 6ddd10c..4415a2e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -38,6 +38,8 @@ Trunk (unreleased changes)
 
       BOOKKEEPER-846: TestLedgerChecker times out (rakeshr via sijie)
 
+      BOOKKEEPER-854: NPE on InterleavedLedgerStorage.onRotateEntryLog (sijie)
+
     IMPROVEMENTS:
 
       BOOKKEEPER-800: Expose whether a ledger is closed or not (ivank)

http://git-wip-us.apache.org/repos/asf/bookkeeper/blob/1387b2be/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/SortedLedgerStorage.java
----------------------------------------------------------------------
diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/SortedLedgerStorage.java
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/SortedLedgerStorage.java
index 3e0ce5e..da14885 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/SortedLedgerStorage.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/SortedLedgerStorage.java
@@ -46,7 +46,7 @@ public class SortedLedgerStorage extends InterleavedLedgerStorage
                                LedgerDirsManager ledgerDirsManager, LedgerDirsManager indexDirsManager,
                                final CheckpointSource checkpointSource, StatsLogger statsLogger)
                                        throws IOException {
-        super(conf, ledgerManager, ledgerDirsManager, indexDirsManager, null, statsLogger);
+        super(conf, ledgerManager, ledgerDirsManager, indexDirsManager, checkpointSource,
statsLogger);
         this.memTable = new EntryMemTable(conf, checkpointSource, statsLogger);
         this.scheduler = Executors.newSingleThreadScheduledExecutor(
                 new ThreadFactoryBuilder()


Mime
View raw message