hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From te...@apache.org
Subject hbase git commit: HBASE-14342 Recursive call in RegionMergeTransactionImpl.getJournal() (Lars Francke)
Date Tue, 01 Sep 2015 18:12:27 GMT
Repository: hbase
Updated Branches:
  refs/heads/branch-1 58b3cfec0 -> a31adde0b


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/a31adde0
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/a31adde0
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/a31adde0

Branch: refs/heads/branch-1
Commit: a31adde0bd85347360037bb5847a6018c556d9ca
Parents: 58b3cfe
Author: tedyu <yuzhihong@gmail.com>
Authored: Tue Sep 1 11:12:29 2015 -0700
Committer: tedyu <yuzhihong@gmail.com>
Committed: Tue Sep 1 11:12:29 2015 -0700

----------------------------------------------------------------------
 .../hadoop/hbase/regionserver/RegionMergeTransactionImpl.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/a31adde0/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 774c167..514d2d5 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
@@ -824,7 +824,7 @@ public class RegionMergeTransactionImpl implements RegionMergeTransaction
{
 
   @Override
   public List<JournalEntry> getJournal() {
-    return getJournal();
+    return journal;
   }
 
   @Override


Mime
View raw message