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 DE09210F78 for ; Wed, 18 Dec 2013 14:53:45 +0000 (UTC) Received: (qmail 58474 invoked by uid 500); 18 Dec 2013 14:53:41 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 58339 invoked by uid 500); 18 Dec 2013 14:53:37 -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 58108 invoked by uid 99); 18 Dec 2013 14:53:32 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 18 Dec 2013 14:53:32 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id EDA148C34; Wed, 18 Dec 2013 14:53:31 +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 Date: Wed, 18 Dec 2013 14:53:39 -0000 Message-Id: <5bbf0f7ee03e4f22831c6ca39ac6677c@git.apache.org> In-Reply-To: <687d1301506841f8a6e0e7b7a23e4f37@git.apache.org> References: <687d1301506841f8a6e0e7b7a23e4f37@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [09/13] git commit: ACCUMULO-1986 merge failed to pull null pointer checks from 1.4 ACCUMULO-1986 merge failed to pull null pointer checks from 1.4 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/2d97b875 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/2d97b875 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/2d97b875 Branch: refs/heads/master Commit: 2d97b875a90a63060bbda7c9e6d7e79e68de1ae2 Parents: a5e3ed3 Author: Eric Newton Authored: Wed Dec 18 09:49:46 2013 -0500 Committer: Eric Newton Committed: Wed Dec 18 09:49:46 2013 -0500 ---------------------------------------------------------------------- .../src/main/java/org/apache/accumulo/core/data/Mutation.java | 7 +++++++ 1 file changed, 7 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/2d97b875/core/src/main/java/org/apache/accumulo/core/data/Mutation.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/data/Mutation.java b/core/src/main/java/org/apache/accumulo/core/data/Mutation.java index 407dbc0..56ae7a6 100644 --- a/core/src/main/java/org/apache/accumulo/core/data/Mutation.java +++ b/core/src/main/java/org/apache/accumulo/core/data/Mutation.java @@ -223,6 +223,13 @@ public class Mutation implements Writable { this.data = ByteBufferUtil.toBytes(tmutation.data); this.entries = tmutation.entries; this.values = ByteBufferUtil.toBytesList(tmutation.values); + + if (this.row == null) { + throw new IllegalArgumentException("null row"); + } + if (this.data == null) { + throw new IllegalArgumentException("null serialized data"); + } } public Mutation(Mutation m) {