accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject [10/13] git commit: ACCUMULO-1986 merge failed to pull null pointer checks from 1.4
Date Wed, 18 Dec 2013 14:53:40 GMT
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/1.5.1-SNAPSHOT
Commit: 2d97b875a90a63060bbda7c9e6d7e79e68de1ae2
Parents: a5e3ed3
Author: Eric Newton <eric.newton@gmail.com>
Authored: Wed Dec 18 09:49:46 2013 -0500
Committer: Eric Newton <eric.newton@gmail.com>
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) {


Mime
View raw message