TRUNK-6003: Make getLocationsByTag method null safe (openmrs#3768)

Parth59 · May 5, 2021 · 0e5e23f · 0e5e23f
1 parent a15fc5e
commit 0e5e23f
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/api/src/main/java/org/openmrs/api/impl/LocationServiceImpl.java b/api/src/main/java/org/openmrs/api/impl/LocationServiceImpl.java
@@ -207,7 +207,7 @@ public List<Location> getLocationsByTag(LocationTag tag) throws APIException {
 		List<Location> locations = new ArrayList<>();
 
 		for (Location l : dao.getAllLocations(false)) {
-			if (l.getTags().contains(tag)) {
+			if (l.getTags() != null && l.getTags().contains(tag)) {
 				locations.add(l);
 			}
 		}