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 9115211D8F for ; Thu, 12 Jun 2014 23:20:06 +0000 (UTC) Received: (qmail 72408 invoked by uid 500); 12 Jun 2014 23:20:06 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 72376 invoked by uid 500); 12 Jun 2014 23:20:06 -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 72369 invoked by uid 99); 12 Jun 2014 23:20:06 -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, 12 Jun 2014 23:20:06 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 1B47F8C3E16; Thu, 12 Jun 2014 23:20:05 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vines@apache.org To: commits@accumulo.apache.org Date: Thu, 12 Jun 2014 23:20:05 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/2] git commit: ACCUMULO-2410 TServerUtils no longer needs to catch NPE as a thrift bug workaround Repository: accumulo Updated Branches: refs/heads/1.6.1-SNAPSHOT 31aea2ad8 -> f34230f7b ACCUMULO-2410 TServerUtils no longer needs to catch NPE as a thrift bug workaround Signed-off-by: John Vines Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c5aac49e Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c5aac49e Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c5aac49e Branch: refs/heads/1.6.1-SNAPSHOT Commit: c5aac49ed299b7c6eee534333cf080b638bcdecd Parents: 53ec689 Author: al.krinker@gmail.com Authored: Tue Apr 22 19:25:26 2014 -0400 Committer: John Vines Committed: Thu Jun 12 19:18:20 2014 -0400 ---------------------------------------------------------------------- .../java/org/apache/accumulo/server/util/TServerUtils.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/c5aac49e/server/src/main/java/org/apache/accumulo/server/util/TServerUtils.java ---------------------------------------------------------------------- diff --git a/server/src/main/java/org/apache/accumulo/server/util/TServerUtils.java b/server/src/main/java/org/apache/accumulo/server/util/TServerUtils.java index fa4de30..f185661 100644 --- a/server/src/main/java/org/apache/accumulo/server/util/TServerUtils.java +++ b/server/src/main/java/org/apache/accumulo/server/util/TServerUtils.java @@ -148,12 +148,7 @@ public class TServerUtils { metrics.add(ThriftMetrics.idle, (now - idleStart)); } try { - try { - return other.process(in, out); - } catch (NullPointerException ex) { - // THRIFT-1447 - remove with thrift 0.9 - return true; - } + return other.process(in, out); } finally { if (metrics.isEnabled()) { idleStart = System.currentTimeMillis();