Return-Path: 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 791FE3F74 for ; Mon, 2 May 2011 18:14:27 +0000 (UTC) Received: (qmail 12411 invoked by uid 500); 2 May 2011 18:14:27 -0000 Delivered-To: apmail-hbase-commits-archive@hbase.apache.org Received: (qmail 12388 invoked by uid 500); 2 May 2011 18:14:27 -0000 Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@hbase.apache.org Delivered-To: mailing list commits@hbase.apache.org Received: (qmail 12381 invoked by uid 99); 2 May 2011 18:14:27 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 02 May 2011 18:14:27 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 02 May 2011 18:14:26 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 3A96223888FD; Mon, 2 May 2011 18:14:06 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1098705 - in /hbase/trunk: CHANGES.txt src/main/java/org/apache/hadoop/hbase/regionserver/RegionCoprocessorHost.java Date: Mon, 02 May 2011 18:14:06 -0000 To: commits@hbase.apache.org From: stack@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110502181406.3A96223888FD@eris.apache.org> Author: stack Date: Mon May 2 18:14:05 2011 New Revision: 1098705 URL: http://svn.apache.org/viewvc?rev=1098705&view=rev Log: HBASE-3838 RegionCoprocesorHost.preWALRestore throws npe in case there is no RegionObserver registered Modified: hbase/trunk/CHANGES.txt hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/RegionCoprocessorHost.java Modified: hbase/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/hbase/trunk/CHANGES.txt?rev=1098705&r1=1098704&r2=1098705&view=diff ============================================================================== --- hbase/trunk/CHANGES.txt (original) +++ hbase/trunk/CHANGES.txt Mon May 2 18:14:05 2011 @@ -93,6 +93,8 @@ Release 0.91.0 - Unreleased cluster and was returning master hostname for rs to use HBASE-3829 TestMasterFailover failures in jenkins HBASE-3843 splitLogWorker starts too early (Prakash Khemani) + HBASE-3838 RegionCoprocesorHost.preWALRestore throws npe in case there is + no RegionObserver registered (Himanshu Vashishtha) IMPROVEMENTS HBASE-3290 Max Compaction Size (Nicolas Spiegelberg via Stack) Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/RegionCoprocessorHost.java URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/RegionCoprocessorHost.java?rev=1098705&r1=1098704&r2=1098705&view=diff ============================================================================== --- hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/RegionCoprocessorHost.java (original) +++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/RegionCoprocessorHost.java Mon May 2 18:14:05 2011 @@ -920,11 +920,12 @@ public class RegionCoprocessorHost ctx = ObserverContext.createAndPrepare(env, ctx); ((RegionObserver)env.getInstance()).preWALRestore(ctx, info, logKey, logEdit); + bypass |= ctx.shouldBypass(); + if (ctx.shouldComplete()) { + break; + } } - bypass |= ctx.shouldBypass(); - if (ctx.shouldComplete()) { - break; - } + } return bypass; } @@ -943,10 +944,11 @@ public class RegionCoprocessorHost ctx = ObserverContext.createAndPrepare(env, ctx); ((RegionObserver)env.getInstance()).postWALRestore(ctx, info, logKey, logEdit); + if (ctx.shouldComplete()) { + break; + } } - if (ctx.shouldComplete()) { - break; - } + } } }