Changes for ONAP AAF

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

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 26def91..6e7b744 100644 (file)
--- a/src/main/java/org/onap/dmaap/dbcapi/service/TopicService.java
+++ b/src/main/java/org/onap/dmaap/dbcapi/service/TopicService.java
@@ -70,7 +70,9 @@ public class TopicService extends BaseLoggingClass {
                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 );
+               
+               logger.info( "TopicService properties: CentralCname=" + centralCname + 
+                               "   defaultGlobarlMrHost=" + defaultGlobalMrHost  );
        }
        
        public Map<String, Topic> getTopics() {                 
@@ -116,9 +118,11 @@ public class TopicService extends BaseLoggingClass {
                err.reset();  // err filled with NOT_FOUND is expected case, but don't want to litter...
 
                topic.setFqtn( nFqtn );
-
+               
                AafService aaf = new AafService(ServiceType.AAF_TopicMgr);
-               String t = dmaap.getTopicNsRoot() + "." + dmaap.getDmaapName() + ".mr.topic";
+
+               String t = dmaapSvc.getTopicPerm();
+
                String instance = ":topic." + topic.getFqtn();
 
                String[] actions = { "pub", "sub", "view" };