Merge "MR_Cluster.java : Fixed sonar issue"

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..26def91 100644 (file)
--- a/src/main/java/org/onap/dmaap/dbcapi/service/TopicService.java
+++ b/src/main/java/org/onap/dmaap/dbcapi/service/TopicService.java
@@ -197,7 +197,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;
        }

diff --git a/src/main/java/org/onap/dmaap/dbcapi/util/DmaapTimestamp.java b/src/main/java/org/onap/dmaap/dbcapi/util/DmaapTimestamp.java
index e287acb..776a4b4 100644 (file)
--- a/src/main/java/org/onap/dmaap/dbcapi/util/DmaapTimestamp.java
+++ b/src/main/java/org/onap/dmaap/dbcapi/util/DmaapTimestamp.java
@@ -30,7 +30,7 @@ import org.apache.log4j.Logger;
 @XmlRootElement
 public class DmaapTimestamp {
        static final Logger logger = Logger.getLogger(DmaapTimestamp.class);
-       private static Calendar cal = Calendar.getInstance();
+       private Calendar cal = Calendar.getInstance();
        private Date stamp;
        
        public DmaapTimestamp() {