diff options
| author |   dglFromAtt <dgl@research.att.com> | 2018-07-12 16:41:43 -0400 |
|---|---|---|
| committer | dglFromAtt <dgl@research.att.com> | 2018-07-12 16:41:55 -0400 |
| commit | f595e173fdb3921cb6c6855f5389871ee3c3ada3 (patch) | |
| tree | 1af69774dab0aeaa2b8abe77817df3a518f5f2b7 | |
| parent | 8f54f37825746cf82b33a21ff356950eb682d290 (diff) | |
No topic dups in mmagent whitelist
Change-Id: I6acadbf3b7115b4f7171d02651bf8dad9ea6296f
Signed-off-by: dglFromAtt <dgl@research.att.com>
Issue-ID: DMAAP-542
| -rw-r--r-- | pom.xml | 2 | ||||
| -rw-r--r-- | src/main/java/org/onap/dmaap/dbcapi/model/MirrorMaker.java | 5 | ||||
| -rw-r--r-- | src/main/java/org/onap/dmaap/dbcapi/service/MR_ClusterService.java | 8 | ||||
| -rw-r--r-- | version.properties | 2 |
4 files changed, 12 insertions, 5 deletions
@@ -344,7 +344,7 @@ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <jettyVersion>9.3.9.v20160517</jettyVersion> <eelf.version>0.0.1</eelf.version> - <artifact.version>1.0.9-SNAPSHOT</artifact.version> + <artifact.version>1.0.10-SNAPSHOT</artifact.version> <!-- SONAR --> <jacoco.version>0.7.7.201606060606</jacoco.version> <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version> diff --git a/src/main/java/org/onap/dmaap/dbcapi/model/MirrorMaker.java b/src/main/java/org/onap/dmaap/dbcapi/model/MirrorMaker.java index 1e381b8..9f6f402 100644 --- a/src/main/java/org/onap/dmaap/dbcapi/model/MirrorMaker.java +++ b/src/main/java/org/onap/dmaap/dbcapi/model/MirrorMaker.java @@ -194,7 +194,10 @@ public class MirrorMaker extends DmaapObject { public void addTopic( String topic ) { - topics.add(topic); + if ( ! topics.contains(topic)) { + topics.add(topic); + } + logger.info( "Mirrormaker.addTopic: topic=" + topic + " . Now have " + topics.size() + " topics" ); } public int getTopicCount() { diff --git a/src/main/java/org/onap/dmaap/dbcapi/service/MR_ClusterService.java b/src/main/java/org/onap/dmaap/dbcapi/service/MR_ClusterService.java index 2dae579..ed57279 100644 --- a/src/main/java/org/onap/dmaap/dbcapi/service/MR_ClusterService.java +++ b/src/main/java/org/onap/dmaap/dbcapi/service/MR_ClusterService.java @@ -77,8 +77,12 @@ public class MR_ClusterService extends BaseLoggingClass { DcaeLocationService locations = new DcaeLocationService(); List<MR_Cluster> result = new ArrayList<MR_Cluster>(); for( MR_Cluster c: mr_clusters.values() ) { - if ( locations.getDcaeLocation(c.getDcaeLocationName()).isCentral() ) { - result.add(c); + try { + if ( locations.getDcaeLocation(c.getDcaeLocationName()).isCentral() ) { + result.add(c); + } + } catch ( NullPointerException npe ) { + logger.warn( "Failed test isCentral for location:" + c.getDcaeLocationName() ); } } return result; diff --git a/version.properties b/version.properties index f1aed49..5325c31 100644 --- a/version.properties +++ b/version.properties @@ -27,7 +27,7 @@ major=1 minor=0 -patch=9 +patch=10 base_version=${major}.${minor}.${patch} # Release must be completed with git revision # in Jenkins |