Fix NPE when UserIdentity is null

aws · Oct 7, 2020 · c2df718 · c2df718
1 parent 109a240
commit c2df718
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/...onaws/services/lambda/runtime/events/transformers/dynamodb/DynamodbRecordTransformer.java b/...onaws/services/lambda/runtime/events/transformers/dynamodb/DynamodbRecordTransformer.java
@@ -16,7 +16,9 @@ public static Record toRecordV2(final DynamodbEvent.DynamodbStreamRecord record)
                 .eventSource(record.getEventSource())
                 .eventVersion(record.getEventVersion())
                 .userIdentity(
-                        DynamodbIdentityTransformer.toIdentityV2(record.getUserIdentity())
+                        record.getUserIdentity() != null
+                                ? DynamodbIdentityTransformer.toIdentityV2(record.getUserIdentity())
+                                : null
                 )
                 .build();
     }

diff --git a/...s/services/lambda/runtime/events/transformers/dynamodb/DynamodbRecordTransformerTest.java b/...s/services/lambda/runtime/events/transformers/dynamodb/DynamodbRecordTransformerTest.java
@@ -50,4 +50,14 @@ public void testToRecordV2() {
         Assertions.assertEquals(record_v2, convertedRecord);
     }
 
+    @Test
+    public void testToRecordV2WhenUserIdentityIsNull() {
+        DynamodbEvent.DynamodbStreamRecord record = record_event.clone();
+        record.setUserIdentity(null);
+
+        Assertions.assertDoesNotThrow(() -> {
+            DynamodbRecordTransformer.toRecordV2(record);
+        });
+    }
+
 }