X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fonap%2Fdmaap%2Fdbcapi%2Fservice%2FTopicService.java;h=a633982d16ae122f426b0de0051ea8dfb05b7bd2;hb=1360b9df89a422d51ef40644ea5f9cf52cb84c6f;hp=6a93a21dde5b8bdeb786ad56c24acbe6d18285a9;hpb=87bf9245434ad317ea39a84a0099233197f3d7c2;p=dmaap%2Fdbcapi.git

diff --git a/src/main/java/org/onap/dmaap/dbcapi/service/TopicService.java b/src/main/java/org/onap/dmaap/dbcapi/service/TopicService.java
index 6a93a21..a633982 100644
--- a/src/main/java/org/onap/dmaap/dbcapi/service/TopicService.java
+++ b/src/main/java/org/onap/dmaap/dbcapi/service/TopicService.java
@@ -66,10 +66,12 @@ public class TopicService extends BaseLoggingClass {
 	
 	private static String centralCname;
 
+
 	public TopicService(){
 		DmaapConfig p = (DmaapConfig)DmaapConfig.getConfig();
 		defaultGlobalMrHost = p.getProperty("MR.globalHost", "global.host.not.set");
 		centralCname = p.getProperty("MR.CentralCname");
+
 		
 		logger.info( "TopicService properties: CentralCname=" + centralCname + 
 				"   defaultGlobarlMrHost=" + defaultGlobalMrHost  );
@@ -80,9 +82,18 @@ public class TopicService extends BaseLoggingClass {
 	}
 		
 	public List<Topic> getAllTopics() {
+		return getAllTopics( true );
+	}
+	public List<Topic> getAllTopicsWithoutClients() {
+		return getAllTopics(false);
+	}
+	
+	private List<Topic> getAllTopics( Boolean withClients ) {
 		ArrayList<Topic> topics = new ArrayList<Topic>(mr_topics.values());
-		for( Topic topic: topics ) {
-			topic.setClients( clientService.getAllMrClients(topic.getFqtn()));
+		if ( withClients ) {
+			for( Topic topic: topics ) {
+				topic.setClients( clientService.getAllMrClients(topic.getFqtn()));
+			}
 		}
 		return topics;
 	}
@@ -422,10 +433,7 @@ public class TopicService extends BaseLoggingClass {
 			if ( source != null && target != null ) {
 				try { 
 					logger.info( "Create a MM from " + source + " to " + target );
-					MirrorMaker mm = bridge.getMirrorMaker( source, target);
-					if ( mm == null ) {
-						mm = new MirrorMaker(source, target);
-					}
+					MirrorMaker mm = bridge.getNextMM( source, target);
 					mm.addTopic(topic.getFqtn());
 					bridge.updateMirrorMaker(mm);
 				} catch ( Exception ex ) {
@@ -443,6 +451,7 @@ public class TopicService extends BaseLoggingClass {
 
 	}
 	
+	
 	/*
 	 * Prior to 1707, we only supported EDGE_TO_CENTRAL replication.
 	 * This was determined automatically based on presence of edge publishers and central subscribers.