Prevent null elements on existing providers list

openmrs · Jun 26, 2024 · a58039a · a58039a
1 parent 66b7d01
commit a58039a
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/api/src/main/java/org/openmrs/module/fhir2/api/translators/impl/EncounterTranslatorImpl.java b/api/src/main/java/org/openmrs/module/fhir2/api/translators/impl/EncounterTranslatorImpl.java
@@ -17,6 +17,7 @@
 
 import java.util.Collections;
 import java.util.LinkedHashSet;
+import java.util.Objects;
 import java.util.Set;
 import java.util.stream.Collectors;
 
@@ -128,6 +129,7 @@ public org.openmrs.Encounter toOpenmrsType(@Nonnull org.openmrs.Encounter existi
 		existingProviders.addAll(encounter
 		        .getParticipant().stream().map(encounterParticipantComponent -> participantTranslator
 		                .toOpenmrsType(new EncounterProvider(), encounterParticipantComponent))
+				.filter(Objects::nonNull)
 		        .collect(Collectors.toCollection(LinkedHashSet::new)));
 
 		for (EncounterProvider ep : existingEncounter.getEncounterProviders()) {