X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fonap%2Fdmaap%2Fdmf%2Fmr%2Fservice%2Fimpl%2FTopicServiceImpl.java;h=626828b4774958af362702454413ff0ff60a6a50;hb=e157241cb7dfe023f57532f829e381644bdf18be;hp=f2ba222639983e06e873b7a11f71b7b813bf862a;hpb=3504265229c589ecc166e3ad4c33bb198b11e4ce;p=dmaap%2Fmessagerouter%2Fmsgrtr.git

diff --git a/src/main/java/org/onap/dmaap/dmf/mr/service/impl/TopicServiceImpl.java b/src/main/java/org/onap/dmaap/dmf/mr/service/impl/TopicServiceImpl.java
index f2ba222..626828b 100644
--- a/src/main/java/org/onap/dmaap/dmf/mr/service/impl/TopicServiceImpl.java
+++ b/src/main/java/org/onap/dmaap/dmf/mr/service/impl/TopicServiceImpl.java
@@ -26,6 +26,7 @@ package org.onap.dmaap.dmf.mr.service.impl;
 
 import java.io.IOException;
 
+import org.apache.commons.lang.StringUtils;
 import org.apache.http.HttpStatus;
 import org.json.JSONArray;
 import org.json.JSONException;
@@ -281,14 +282,28 @@ public class TopicServiceImpl implements TopicService {
 			final String desc = topicBean.getTopicDescription();
 			int partition = topicBean.getPartitionCount();
 			// int replica = topicBean.getReplicationCount();
+			String defaultPartitions = AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop,
+					"default.partitions");
+			String defaultReplicas = AJSCPropertiesMap.getProperty(CambriaConstants.msgRtr_prop,
+					"default.replicas");
 			if (partition == 0) {
+				if(StringUtils.isNotEmpty(defaultPartitions)){
+					partition=Integer.parseInt(defaultPartitions);	
+				}
+				else{
 				partition = 1;
+				}
 			}
 			final int partitions = partition;
 
 			int replica = topicBean.getReplicationCount();
 			if (replica == 0) {
+				if(StringUtils.isNotEmpty(defaultReplicas)){
+					replica=Integer.parseInt(defaultReplicas);	
+				}
+				else{
 				replica = 1;
+				}
 			}
 			final int replicas = replica;
 			boolean transactionEnabled = topicBean.isTransactionEnabled();