Return-Path: X-Original-To: apmail-accumulo-commits-archive@www.apache.org Delivered-To: apmail-accumulo-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 B1DA910470 for ; Thu, 16 Jan 2014 15:41:57 +0000 (UTC) Received: (qmail 97535 invoked by uid 500); 16 Jan 2014 15:41:57 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 95405 invoked by uid 500); 16 Jan 2014 15:41:52 -0000 Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list commits@accumulo.apache.org Received: (qmail 94533 invoked by uid 99); 16 Jan 2014 15:41:51 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 Jan 2014 15:41:51 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 5AD59835AC6; Thu, 16 Jan 2014 15:41:51 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ecn@apache.org To: commits@accumulo.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: git commit: ACCUMULO-2202 catch all runtime exceptions, not just NPE Date: Thu, 16 Jan 2014 15:41:51 +0000 (UTC) Updated Branches: refs/heads/1.4.5-SNAPSHOT 5fdecd72e -> 91be551f6 ACCUMULO-2202 catch all runtime exceptions, not just NPE Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/91be551f Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/91be551f Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/91be551f Branch: refs/heads/1.4.5-SNAPSHOT Commit: 91be551f655bf0a1d80493c95eafadd0025cfe40 Parents: 5fdecd7 Author: Eric Newton Authored: Thu Jan 16 10:39:24 2014 -0500 Committer: Eric Newton Committed: Thu Jan 16 10:39:24 2014 -0500 ---------------------------------------------------------------------- .../java/org/apache/accumulo/core/file/BloomFilterLayer.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/91be551f/src/core/src/main/java/org/apache/accumulo/core/file/BloomFilterLayer.java ---------------------------------------------------------------------- diff --git a/src/core/src/main/java/org/apache/accumulo/core/file/BloomFilterLayer.java b/src/core/src/main/java/org/apache/accumulo/core/file/BloomFilterLayer.java index f580a12..98f82e1 100644 --- a/src/core/src/main/java/org/apache/accumulo/core/file/BloomFilterLayer.java +++ b/src/core/src/main/java/org/apache/accumulo/core/file/BloomFilterLayer.java @@ -249,11 +249,11 @@ public class BloomFilterLayer { } catch (IllegalAccessException e) { LOG.error("Illegal acess exception", e); bloomFilter = null; - } catch (NullPointerException npe) { + } catch (RuntimeException rte) { if (!closed) - throw npe; + throw rte; else - LOG.debug("Can't open BloomFilter, NPE after closed ", npe); + LOG.debug("Can't open BloomFilter, RTE after closed ", rte); } finally { if (in != null) {