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 5AC0C9EB2 for ; Thu, 29 Mar 2012 18:33:14 +0000 (UTC) Received: (qmail 70782 invoked by uid 500); 29 Mar 2012 18:33:14 -0000 Delivered-To: apmail-hbase-commits-archive@hbase.apache.org Received: (qmail 70746 invoked by uid 500); 29 Mar 2012 18:33:14 -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 70737 invoked by uid 99); 29 Mar 2012 18:33:14 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 29 Mar 2012 18:33:14 +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; Thu, 29 Mar 2012 18:33:13 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 2B31723889E1 for ; Thu, 29 Mar 2012 18:32:53 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1307035 - /hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java Date: Thu, 29 Mar 2012 18:32:53 -0000 To: commits@hbase.apache.org From: ramkrishna@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120329183253.2B31723889E1@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ramkrishna Date: Thu Mar 29 18:32:52 2012 New Revision: 1307035 URL: http://svn.apache.org/viewvc?rev=1307035&view=rev Log: HBASE-5097 RegionObserver implementation whose preScannerOpen and postScannerOpen Impl return null can stall the system initialization through NPE (Ram) Modified: hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java Modified: hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java URL: http://svn.apache.org/viewvc/hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java?rev=1307035&r1=1307034&r2=1307035&view=diff ============================================================================== --- hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java (original) +++ hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java Thu Mar 29 18:32:52 2012 @@ -2324,7 +2324,14 @@ public class HRegionServer implements HR s = r.getScanner(scan); } if (r.getCoprocessorHost() != null) { - s = r.getCoprocessorHost().postScannerOpen(scan, s); + RegionScanner savedScanner = r.getCoprocessorHost().postScannerOpen( + scan, s); + if (savedScanner == null) { + LOG.warn("PostScannerOpen impl returning null. " + + "Check the RegionObserver implementation."); + } else { + s = savedScanner; + } } return addScanner(s); } catch (Throwable t) {