ACCUMULO-2255 fix NPE during commit
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/204bcfed Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/204bcfed Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/204bcfed Branch: refs/heads/ACCUMULO-378 Commit: 204bcfedcd9840b8b95bf48b81d5d1e4eaed5016 Parents: 8071252 Author: Eric C. Newton <eric.new...@gmail.com> Authored: Thu Jun 5 16:04:18 2014 -0400 Committer: Eric C. Newton <eric.new...@gmail.com> Committed: Thu Jun 5 16:04:44 2014 -0400 ---------------------------------------------------------------------- .../src/main/java/org/apache/accumulo/tserver/TabletServer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/204bcfed/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java ---------------------------------------------------------------------- diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java index ee28c7f..ce84bd3 100644 --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java @@ -1478,7 +1478,7 @@ public class TabletServer extends AbstractMetricsImpl implements org.apache.accu KeyExtent extent = commitSession.getExtent(); - if (extent == us.currentTablet.getExtent()) { + if (us.currentTablet != null && extent == us.currentTablet.getExtent()) { // because constraint violations may filter out some // mutations, for proper accounting with the client code, // need to increment the count based on the original
