Repository: hbase Updated Branches: refs/heads/branch-1.2 67ac114d1 -> f8870cbbc
HBASE-14342 Recursive call in RegionMergeTransactionImpl.getJournal() (Lars Francke) Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/f8870cbb Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/f8870cbb Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/f8870cbb Branch: refs/heads/branch-1.2 Commit: f8870cbbcdb8a86ea5f2d3fa6d0066628f5f5aa0 Parents: 67ac114 Author: tedyu <yuzhih...@gmail.com> Authored: Tue Sep 1 11:12:29 2015 -0700 Committer: Sean Busbey <bus...@cloudera.com> Committed: Thu Dec 17 15:01:10 2015 -0600 ---------------------------------------------------------------------- .../hadoop/hbase/regionserver/RegionMergeTransactionImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/f8870cbb/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionMergeTransactionImpl.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionMergeTransactionImpl.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionMergeTransactionImpl.java index 45c70da..03aa059 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionMergeTransactionImpl.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionMergeTransactionImpl.java @@ -949,7 +949,7 @@ public class RegionMergeTransactionImpl implements RegionMergeTransaction { @Override public List<JournalEntry> getJournal() { - return getJournal(); + return journal; } @Override