From 21d4e91734bcc5e85da3b29d9ff5dc8ec0bfb8df Mon Sep 17 00:00:00 2001
From: Dmitry Toptygin <dmitry.toptygin@connectus.ai>
Date: Mon, 1 Jun 2020 22:27:39 -0400
Subject: [PATCH] hardened RoutingDatastoreInMemory against NPE

---
 .../datastore/inmemory/RoutingDatastoreInMemory.java      | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/routing-datastore-inmemory/src/main/java/com/telecominfraproject/wlan/routing/datastore/inmemory/RoutingDatastoreInMemory.java b/routing-datastore-inmemory/src/main/java/com/telecominfraproject/wlan/routing/datastore/inmemory/RoutingDatastoreInMemory.java
index a54300f4..41ed9b1a 100644
--- a/routing-datastore-inmemory/src/main/java/com/telecominfraproject/wlan/routing/datastore/inmemory/RoutingDatastoreInMemory.java
+++ b/routing-datastore-inmemory/src/main/java/com/telecominfraproject/wlan/routing/datastore/inmemory/RoutingDatastoreInMemory.java
@@ -331,7 +331,13 @@ public class RoutingDatastoreInMemory extends BaseInMemoryDatastore implements R
 		});
 
 		List<EquipmentGatewayRecord> ret = new ArrayList<>();
-		gwIds.forEach(id -> ret.add(idToGatewayMap.get(id).clone()));
+		
+		gwIds.forEach(id -> {
+			EquipmentGatewayRecord gw = idToGatewayMap.get(id);
+			if(gw!=null) {
+				ret.add(gw.clone());
+			}
+		});
 		
 		return ret;
 	}