From 8ec24613f1fbb400033ae1fbf184b9f774f893ee Mon Sep 17 00:00:00 2001
From: Gary Helmling <gary@cask.co>
Date: Fri, 31 Jul 2015 21:05:39 -0700
Subject: [PATCH] TEPHRA-116 Defensively check for null fields in deserialized
 TTransaction

---
 .../distributed/TransactionConverterUtils.java      | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/tephra-core/src/main/java/co/cask/tephra/distributed/TransactionConverterUtils.java b/tephra-core/src/main/java/co/cask/tephra/distributed/TransactionConverterUtils.java
index 070b43f0..6aad7d46 100644
--- a/tephra-core/src/main/java/co/cask/tephra/distributed/TransactionConverterUtils.java
+++ b/tephra-core/src/main/java/co/cask/tephra/distributed/TransactionConverterUtils.java
@@ -27,6 +27,7 @@
  * Utility methods to convert to thrift and back.
  */
 public final class TransactionConverterUtils {
+  private static final long[] EMPTY_LONG_ARRAY = {};
 
   public static TTransaction wrap(Transaction tx) {
     return new TTransaction(tx.getTransactionId(), tx.getReadPointer(),
@@ -38,9 +39,12 @@ public static TTransaction wrap(Transaction tx) {
 
   public static Transaction unwrap(TTransaction thriftTx) {
     return new Transaction(thriftTx.getReadPointer(), thriftTx.getTransactionId(), thriftTx.getWritePointer(),
-                           Longs.toArray(thriftTx.getInvalids()), Longs.toArray(thriftTx.getInProgress()),
+                           thriftTx.getInvalids() == null ? EMPTY_LONG_ARRAY : Longs.toArray(thriftTx.getInvalids()),
+                           thriftTx.getInProgress() == null ? EMPTY_LONG_ARRAY :
+                               Longs.toArray(thriftTx.getInProgress()),
                            thriftTx.getFirstShort(), getTransactionType(thriftTx.getType()),
-                           Longs.toArray(thriftTx.getCheckpointWritePointers()),
+                           thriftTx.getCheckpointWritePointers() == null ? EMPTY_LONG_ARRAY :
+                               Longs.toArray(thriftTx.getCheckpointWritePointers()),
                            getVisibilityLevel(thriftTx.getVisibilityLevel()));
   }
 
@@ -53,6 +57,11 @@ private static TTransactionType getTTransactionType(TransactionType type) {
   }
 
   private static Transaction.VisibilityLevel getVisibilityLevel(TVisibilityLevel tLevel) {
+    // default to SNAPSHOT
+    if (tLevel == null) {
+      return Transaction.VisibilityLevel.SNAPSHOT;
+    }
+
     switch (tLevel) {
       case SNAPSHOT:
         return Transaction.VisibilityLevel.SNAPSHOT;