aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvarun gudisena <varuneshwar.gudisena@att.com>2019-01-18 14:40:57 +0000
committerGerrit Code Review <gerrit@onap.org>2019-01-18 14:40:57 +0000
commit99a69b81bca73117846e55bd0129cf3172d4ee08 (patch)
treeda00859a3633f2913d9211f316367378311ad196
parent498266dbdbb166c069e1538be86765e7280a9358 (diff)
parentb36c390935a18e0a6883ee31399178e6ab8e7de5 (diff)
Merge "Fixed bug in BridgeResource.java"
-rw-r--r--src/main/java/org/onap/dmaap/dbcapi/resources/BridgeResource.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/main/java/org/onap/dmaap/dbcapi/resources/BridgeResource.java b/src/main/java/org/onap/dmaap/dbcapi/resources/BridgeResource.java
index e6fede7..192b63d 100644
--- a/src/main/java/org/onap/dmaap/dbcapi/resources/BridgeResource.java
+++ b/src/main/java/org/onap/dmaap/dbcapi/resources/BridgeResource.java
@@ -4,6 +4,8 @@
* ================================================================================
* Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
* ================================================================================
+ * Modifications Copyright (C) 2018 IBM.
+ * ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
@@ -121,7 +123,7 @@ public class BridgeResource extends BaseLoggingClass {
}
logger.info( "Count for "+ key + ": " + mCnt);
totCnt += mCnt;
- if (showDetail) {
+ if (showDetail && mm!=null) {
brTopic[s] = new BrTopic();
brTopic[s].setBrSource( mm.getSourceCluster());
brTopic[s].setBrTarget(mm.getTargetCluster());