From 5b0214c6f2214342a3e343842cbff68c0a264c6b Mon Sep 17 00:00:00 2001
From: Jon Chambers <63609320+jon-signal@users.noreply.github.com>
Date: Fri, 4 Jun 2021 11:18:59 -0400
Subject: [PATCH] Make pre-key `take` operations more null-safe
---
.../org/whispersystems/textsecuregcm/storage/KeysDynamoDb.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/storage/KeysDynamoDb.java b/service/src/main/java/org/whispersystems/textsecuregcm/storage/KeysDynamoDb.java
index 969a0e797..3fcc9dbb1 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/storage/KeysDynamoDb.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/storage/KeysDynamoDb.java
@@ -99,7 +99,7 @@ public class KeysDynamoDb extends AbstractDynamoDbStore {
.returnValues(ReturnValue.ALL_OLD)
.build();
DeleteItemResponse deleteItemResponse = db().deleteItem(deleteItemRequest);
- if (deleteItemResponse.attributes() != null) {
+ if (deleteItemResponse.hasAttributes()) {
return Optional.of(getPreKeyFromItem(deleteItemResponse.attributes()));
}
--
GitLab