GenericHollowObject actually returns null when referenced records are…

… null
Netflix · Feb 28, 2017 · 106c9e5 · 106c9e5
1 parent 0c416a4
commit 106c9e5
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/hollow/src/main/java/com/netflix/hollow/api/objects/generic/GenericHollowObject.java b/hollow/src/main/java/com/netflix/hollow/api/objects/generic/GenericHollowObject.java
@@ -76,8 +76,12 @@ public final HollowRecord getReferencedGenericRecord(String fieldName) {
                 return null;
             }
         }
-
-        return GenericHollowRecordHelper.instantiate(getTypeDataAccess().getDataAccess(), referencedType, getOrdinal(fieldName));
+
+        int ordinal = getOrdinal(fieldName);
+        if(ordinal == -1)
+            return null;
+
+        return GenericHollowRecordHelper.instantiate(getTypeDataAccess().getDataAccess(), referencedType, ordinal);
     }
 
     @Override