From: Guangrong Fu <fu.guangrong@zte.com.cn>
Date: Thu, 9 Mar 2017 09:12:18 +0000 (+0000)
Subject: Merge "Fix register micro service code"
X-Git-Tag: release/mercury~14
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=46c009200583a0e5551e5de1cfc91c8b0b3e42cb;hp=64b3168e1993689c9003ee43b3ae5811b626c866;p=holmes%2Fcommon.git

Merge "Fix register micro service code"
---

diff --git a/holmes-actions/src/main/java/org/openo/holmes/common/api/stat/Alarm.java b/holmes-actions/src/main/java/org/openo/holmes/common/api/stat/Alarm.java
index 3ea3715..c12b549 100644
--- a/holmes-actions/src/main/java/org/openo/holmes/common/api/stat/Alarm.java
+++ b/holmes-actions/src/main/java/org/openo/holmes/common/api/stat/Alarm.java
@@ -201,7 +201,7 @@ public class Alarm implements AplusData, Cloneable, Serializable {
 
     @Override
     public boolean equals(Object arg0) {
-        if (arg0 == null) {
+        if (arg0 == null || !(arg0 instanceof Alarm)) {
             return false;
         }
         return this.alarmKey.equals(((Alarm) arg0).getAlarmKey());
diff --git a/holmes-actions/src/main/java/org/openo/holmes/common/producer/MQProducer.java b/holmes-actions/src/main/java/org/openo/holmes/common/producer/MQProducer.java
index 0de1289..d258695 100644
--- a/holmes-actions/src/main/java/org/openo/holmes/common/producer/MQProducer.java
+++ b/holmes-actions/src/main/java/org/openo/holmes/common/producer/MQProducer.java
@@ -24,6 +24,7 @@ import javax.jms.JMSException;
 import javax.jms.MessageProducer;
 import javax.jms.ObjectMessage;
 import javax.jms.Session;
+import lombok.NoArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.glassfish.hk2.api.IterableProvider;
 import org.jvnet.hk2.annotations.Service;
@@ -36,16 +37,13 @@ import org.apache.activemq.ActiveMQConnectionFactory;
 
 @Service
 @Slf4j
+@NoArgsConstructor
 public class MQProducer {
 
     @Inject
     private IterableProvider<MQConfig> mqConfigProvider;
     private ConnectionFactory connectionFactory;
 
-    public MQProducer() {
-
-    }
-
     public void init() {
 
         String brokerURL =