Return-Path: 
 <commits-return-26770-apmail-hbase-commits-archive=hbase.apache.org@hbase.apache.org>
X-Original-To: apmail-hbase-commits-archive@www.apache.org
Delivered-To: apmail-hbase-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 2B83118100
	for <apmail-hbase-commits-archive@www.apache.org>;
 Tue,  1 Sep 2015 18:12:50 +0000 (UTC)
Received: (qmail 12256 invoked by uid 500); 1 Sep 2015 18:12:28 -0000
Delivered-To: apmail-hbase-commits-archive@hbase.apache.org
Received: (qmail 12210 invoked by uid 500); 1 Sep 2015 18:12:27 -0000
Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@hbase.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@hbase.apache.org>
List-Post: <mailto:commits@hbase.apache.org>
List-Id: <commits.hbase.apache.org>
Reply-To: dev@hbase.apache.org
Delivered-To: mailing list commits@hbase.apache.org
Received: (qmail 12201 invoked by uid 99); 1 Sep 2015 18:12:27 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org)
 (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Sep 2015 18:12:27 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at
 git1-us-west.apache.org, from userid 33)
	id C7E31DFBBB; Tue,  1 Sep 2015 18:12:27 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: tedyu@apache.org
To: commits@hbase.apache.org
Message-Id: <ccdad8493d82473994777d7e6cd50b9b@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: hbase git commit: HBASE-14342 Recursive call in
 RegionMergeTransactionImpl.getJournal() (Lars Francke)
Date: Tue,  1 Sep 2015 18:12:27 +0000 (UTC)

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