From c97be15e79a84349f4aaa48cabf75c67997d773c Mon Sep 17 00:00:00 2001
From: brock-signal <78765201+brock-signal@users.noreply.github.com>
Date: Tue, 1 Jun 2021 15:00:41 -0600
Subject: [PATCH] Fix NPE when a null message comes in from a client

---
 .../textsecuregcm/entities/IncomingMessageList.java            | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/entities/IncomingMessageList.java b/service/src/main/java/org/whispersystems/textsecuregcm/entities/IncomingMessageList.java
index 12ec6104e..f6bb0c5ab 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/entities/IncomingMessageList.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/entities/IncomingMessageList.java
@@ -4,6 +4,8 @@
  */
 package org.whispersystems.textsecuregcm.entities;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 import javax.validation.Valid;
@@ -15,6 +17,7 @@ public class IncomingMessageList {
   @JsonProperty
   @NotNull
   @Valid
+  @JsonInclude(Include.NON_NULL)
   private List<IncomingMessage> messages;
 
   @JsonProperty