X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fonap%2Fdmaap%2Fdbcapi%2Fservice%2FTopicService.java;h=6e7b7445e1e2a280a568ea7dcee60e6777977f0e;hb=378d55bf699e9a3d6c5a1f1a5e47bdbde9594abc;hp=3943419d6ede683f779228387f9531767b9683a3;hpb=1611944a45491e2b8f00606b0aac2cdb0de8dde8;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 3943419..6e7b744 100644
--- 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" };
@@ -197,7 +201,9 @@ public class TopicService extends BaseLoggingClass {
 				return null;
 			}
 		}
-		mr_topics.put( ntopic.getFqtn(), ntopic );
+		if(ntopic != null) {
+			mr_topics.put( ntopic.getFqtn(), ntopic );
+		}
 		err.setCode(Status.OK.getStatusCode());
 		return ntopic;
 	}