Refactor code to support no AAF requests

[dmaap/dbcapi.git] / src / main / java / org / onap / dmaap / dbcapi / service / DcaeLocationService.java

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 (file)
--- 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;
                }