X-Git-Url: https://gerrit.onap.org/r/gitweb?p=dmaap%2Fdbcapi.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fonap%2Fdmaap%2Fdbcapi%2Fservice%2FDcaeLocationService.java;h=de72ade62fe090d915161e212f08e3753eba6ba5;hp=44166b875423d7c0fa8661c03f9834652f78a21e;hb=0bff051a842b164b680bc938f4a56db435dd5841;hpb=a05efb7b7b3cfc77f5e3fda11e8434834829f56a

diff --git a/src/main/java/org/onap/dmaap/dbcapi/service/DcaeLocationService.java b/src/main/java/org/onap/dmaap/dbcapi/service/DcaeLocationService.java
index 44166b8..de72ade 100644
--- a/src/main/java/org/onap/dmaap/dbcapi/service/DcaeLocationService.java
+++ b/src/main/java/org/onap/dmaap/dbcapi/service/DcaeLocationService.java
@@ -24,17 +24,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-
-
-
-
-
-
-
-
-
-
-import org.onap.dmaap.dbcapi.aaf.database.DatabaseClass;
+import org.onap.dmaap.dbcapi.database.DatabaseClass;
 import org.onap.dmaap.dbcapi.model.DcaeLocation;
 import org.onap.dmaap.dbcapi.model.DmaapObject.DmaapObject_Status;
 
@@ -88,6 +78,9 @@ public class DcaeLocationService {
 	
 	public boolean isEdgeLocation(String aName) {
 		DcaeLocation loc = dcaeLocations.get(aName);
+		if ( loc == null ) {
+			return false;
+		}
 		if ( ! loc.isCentral() ) {
 				return true;
 		}