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%2FMR_ClusterService.java;h=d8eb91dbe933037b606189133610db0bf0981427;hp=977288bf294633a54687ab9bd331510ea81c8894;hb=503da874ce876dbe463bcc1a03f63ea0f48fe650;hpb=0afd0dd2f1fa4435fa730a287e68fec4f271e617

diff --git a/src/main/java/org/onap/dmaap/dbcapi/service/MR_ClusterService.java b/src/main/java/org/onap/dmaap/dbcapi/service/MR_ClusterService.java
index 977288b..d8eb91d 100644
--- a/src/main/java/org/onap/dmaap/dbcapi/service/MR_ClusterService.java
+++ b/src/main/java/org/onap/dmaap/dbcapi/service/MR_ClusterService.java
@@ -120,7 +120,12 @@ public class MR_ClusterService extends BaseLoggingClass {
 		mr_clusters.put( cluster.getDcaeLocationName(), cluster );
 		DcaeLocationService svc = new DcaeLocationService();
 		DcaeLocation loc = svc.getDcaeLocation( cluster.getDcaeLocationName() );
-		if ( loc.isCentral() ) {
+		if ( loc == null ) {
+			logger.error( "DcaeLocation not found for cluster in " + cluster.getDcaeLocationName() );
+			cluster.setLastMod();
+			cluster.setStatus(DmaapObject_Status.INVALID);
+			mr_clusters.put( cluster.getDcaeLocationName(), cluster );
+		} else if ( loc.isCentral() ) {
 			ApiError resp = TopicService.setBridgeClientPerms( cluster );
 			if ( ! resp.is2xx() ) {
 				logger.error( "Unable to provision Bridge to " + cluster.getDcaeLocationName() );