X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain%2Fjava%2Forg%2Fonap%2Fdmaap%2Fdbcapi%2Fservice%2FMR_ClusterService.java;h=ed572791bc08a0cec47b63de144fc42f9eb69d70;hb=f595e173fdb3921cb6c6855f5389871ee3c3ada3;hp=529723ed31fb25e65df449ab3fa4c2d01a88a96a;hpb=0bff051a842b164b680bc938f4a56db435dd5841;p=dmaap%2Fdbcapi.git

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 529723e..ed57279 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
@@ -32,10 +32,19 @@ import org.onap.dmaap.dbcapi.model.ApiError;
 import org.onap.dmaap.dbcapi.model.DcaeLocation;
 import org.onap.dmaap.dbcapi.model.MR_Cluster;
 import org.onap.dmaap.dbcapi.model.DmaapObject.DmaapObject_Status;
+import org.onap.dmaap.dbcapi.util.DmaapConfig;
 
 public class MR_ClusterService extends BaseLoggingClass {
 
 	private Map<String, MR_Cluster> mr_clusters = DatabaseClass.getMr_clusters();
+	private boolean multiSite;
+	
+	public MR_ClusterService() {
+		logger.info( "new ClusterService");
+		DmaapConfig p = (DmaapConfig)DmaapConfig.getConfig();
+		multiSite = "true".equalsIgnoreCase(p.getProperty("MR.multisite", "true"));
+				
+	}
 	
 	public Map<String, MR_Cluster> getMR_Clusters() {			
 		return mr_clusters;
@@ -68,8 +77,12 @@ public class MR_ClusterService extends BaseLoggingClass {
 		DcaeLocationService locations = new DcaeLocationService();
 		List<MR_Cluster> result = new ArrayList<MR_Cluster>();
 		for( MR_Cluster c: mr_clusters.values() ) {
-			if ( locations.getDcaeLocation(c.getDcaeLocationName()).isCentral() ) {
-				result.add(c);
+			try {
+				if ( locations.getDcaeLocation(c.getDcaeLocationName()).isCentral() ) {
+					result.add(c);
+				}
+			} catch ( NullPointerException npe ) {
+				logger.warn( "Failed test isCentral for location:" + c.getDcaeLocationName() );
 			}
 		}
 		return result;
@@ -89,7 +102,7 @@ public class MR_ClusterService extends BaseLoggingClass {
 		mr_clusters.put( cluster.getDcaeLocationName(), cluster );
 		DcaeLocationService svc = new DcaeLocationService();
 		DcaeLocation loc = svc.getDcaeLocation( cluster.getDcaeLocationName() );
-		if ( loc != null && loc.isCentral() ) {
+		if ( loc != null && loc.isCentral() && multiSite ) {
 			ApiError resp = TopicService.setBridgeClientPerms( cluster );
 			if ( ! resp.is2xx() ) {
 				logger.error( "Unable to provision Bridge to " + cluster.getDcaeLocationName() );
@@ -119,7 +132,7 @@ public class MR_ClusterService extends BaseLoggingClass {
 			cluster.setLastMod();
 			cluster.setStatus(DmaapObject_Status.INVALID);
 			mr_clusters.put( cluster.getDcaeLocationName(), cluster );
-		} else if ( loc.isCentral() ) {
+		} else if ( loc.isCentral()  & multiSite ) {
 			ApiError resp = TopicService.setBridgeClientPerms( cluster );
 			if ( ! resp.is2xx() ) {
 				logger.error( "Unable to provision Bridge to " + cluster.getDcaeLocationName() );