fix: guard against NullPointerException in mergeFields, mergeEnums

googleapis · May 30, 2024 · b8c09ea · b8c09ea
1 parent 7ce8f84
commit b8c09ea
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/src/main/java/com/google/cloud/discotoproto3converter/proto3/ProtoMerger.java b/src/main/java/com/google/cloud/discotoproto3converter/proto3/ProtoMerger.java
@@ -87,6 +87,11 @@ private void mergeMessages(Map<String, Message> newMessages, Map<String, Message
 
   private void mergeEnums(
       Map<String, Message> newMessages, Message oldMessage, Message newMessage) {
+
+    if (newMessage == null) {
+      return;
+    }
+
     Map<String, Message> newEnumsMap = new HashMap<>();
     for (Message nestedEnum : newMessage.getEnums()) {
       newEnumsMap.put(nestedEnum.getName(), nestedEnum);
@@ -99,6 +104,11 @@ private void mergeEnums(
 
   private void mergeFields(
       Message newMessage, Message oldMessage, Map<String, Message> newMessages) {
+
+    if (newMessage == null) {
+      return;
+    }
+
     // Merge fields
     Map<String, Field> newFieldsMap =
         newMessage.getFields().stream().collect(Collectors.toMap(ProtoElement::getName, f -> f));