accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bhava...@apache.org
Subject [02/10] git commit: ACCUMULO-2523 TabletTime.maxMetadataTime NPE if both arguments are null
Date Wed, 23 Apr 2014 15:10:09 GMT
ACCUMULO-2523 TabletTime.maxMetadataTime NPE if both arguments are null

Signed-off-by: Bill Havanki <bhavanki@cloudera.com>


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/80f8afb1
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/80f8afb1
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/80f8afb1

Branch: refs/heads/1.5.2-SNAPSHOT
Commit: 80f8afb10c69bf337ffd7301e21f729c1c0ce27b
Parents: 92c4171
Author: al.krinker@gmail.com <al.krinker@gmail.com>
Authored: Tue Apr 22 19:04:42 2014 -0400
Committer: Bill Havanki <bhavanki@cloudera.com>
Committed: Wed Apr 23 11:08:35 2014 -0400

----------------------------------------------------------------------
 .../java/org/apache/accumulo/server/tabletserver/TabletTime.java | 4 ++++
 1 file changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/80f8afb1/src/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletTime.java
----------------------------------------------------------------------
diff --git a/src/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletTime.java
b/src/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletTime.java
index 255572d..3ba8445 100644
--- a/src/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletTime.java
+++ b/src/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletTime.java
@@ -78,6 +78,10 @@ public abstract class TabletTime {
   }
   
   public static String maxMetadataTime(String mv1, String mv2) {
+    if (mv1 == null && mv2 == null) {
+      return null;
+    }
+    
     if (mv1 == null) {
       checkType(mv2);
       return mv2;


Mime
View raw message