X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fonap%2Fdmaap%2Fdbcapi%2Fservice%2FTopicService.java;h=49966d785a990fc2a2627f5fec2b9ac9bfbd1413;hb=30f5f28cdd17eb94ca70db6dbf027cc330bb59e7;hp=e4bc96c2a317d115a1716f27892c05440a831ce5;hpb=0e39c2d9a88a26693de1cd522766df5894917b3f;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 e4bc96c..49966d7 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  );
@@ -249,10 +251,11 @@ public class TopicService extends BaseLoggingClass {
 		String mmAgentRole = p.getProperty("MM.AgentRole");
 		String[] Roles = { mmProvRole, mmAgentRole };
 		String[] actions = { "view", "pub", "sub" };
-		Topic bridgeAdminTopic = new Topic();
+		Topic bridgeAdminTopic = new Topic().init();
 		bridgeAdminTopic.setTopicName( dmaapSvc.getBridgeAdminFqtn() );
 		bridgeAdminTopic.setTopicDescription( "RESERVED topic for MirroMaker Provisioning");
 		bridgeAdminTopic.setOwner( "DBC" );
+		
 		ArrayList<MR_Client> clients = new ArrayList<MR_Client>();
 		for( String role: Roles ) {
 			MR_Client client = new MR_Client();
@@ -431,10 +434,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, topic.getFqtn());
 					mm.addTopic(topic.getFqtn());
 					bridge.updateMirrorMaker(mm);
 				} catch ( Exception ex ) {
@@ -452,6 +452,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.