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 <vi...@apache.org> 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.krin...@gmail.com <al.krin...@gmail.com> Authored: Tue Apr 22 19:25:26 2014 -0400 Committer: John Vines <vi...@apache.org> 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();
