Fix some minor issues found through static analysis

Change-Id: I314bef2f98fceaca399c3a9358b371deae6188eb
Signed-off-by: David Suarez <david.suarez.fuentes@gmail.com>

diff --git a/alarm/impl/src/main/java/org/opendaylight/netvirt/alarm/NeutronvpnAlarms.java b/alarm/impl/src/main/java/org/opendaylight/netvirt/alarm/NeutronvpnAlarms.java
index 34aa486806bf6d78e4a3f934e413f8698ecd8eb4..9689e7896075c9de5af1505dbc6e86ec621cd136 100644 (file)
--- a/alarm/impl/src/main/java/org/opendaylight/netvirt/alarm/NeutronvpnAlarms.java
+++ b/alarm/impl/src/main/java/org/opendaylight/netvirt/alarm/NeutronvpnAlarms.java
@@ -14,7 +14,7 @@ import org.slf4j.LoggerFactory;
 public class NeutronvpnAlarms {
 
     private static final Logger LOG = LoggerFactory.getLogger(NeutronvpnAlarms.class);
-    protected NvpnJMXAlarmAgent alarmAgent = new NvpnJMXAlarmAgent();
+    protected final NvpnJMXAlarmAgent alarmAgent = new NvpnJMXAlarmAgent();
     private static final String ALARM_TEXT = "ExtraRouteConfigFaultAlarm";
     private static final String ALARM_ID = "NeutronvpnControlPathFailure";
     private static final String SOURCE_START = "neutronvpn:";

diff --git a/alarm/impl/src/main/java/org/opendaylight/netvirt/alarm/NvpnJMXAlarmAgent.java b/alarm/impl/src/main/java/org/opendaylight/netvirt/alarm/NvpnJMXAlarmAgent.java
index 27d749a125ef521fdfdf17bf07d7a4e9966f3dc6..32effb5ea1257726646eec7a8fce1ad6368a2a9f 100644 (file)
--- a/alarm/impl/src/main/java/org/opendaylight/netvirt/alarm/NvpnJMXAlarmAgent.java
+++ b/alarm/impl/src/main/java/org/opendaylight/netvirt/alarm/NvpnJMXAlarmAgent.java
@@ -30,9 +30,9 @@ public class NvpnJMXAlarmAgent {
     public static final String OP_CLEARALARM = "clearAlarm";
     private static final Logger LOG = LoggerFactory.getLogger(NvpnJMXAlarmAgent.class);
 
-    public MBeanServer mbs = null;
+    private MBeanServer mbs;
     private ObjectName alarmName = null;
-    private NvpnNbrControlPathAlarm alarmBean = new NvpnNbrControlPathAlarm();
+    private final NvpnNbrControlPathAlarm alarmBean = new NvpnNbrControlPathAlarm();
 
     public NvpnJMXAlarmAgent() {
         mbs = ManagementFactory.getPlatformMBeanServer();

diff --git a/alarm/impl/src/main/java/org/opendaylight/netvirt/alarm/NvpnNbrControlPathAlarm.java b/alarm/impl/src/main/java/org/opendaylight/netvirt/alarm/NvpnNbrControlPathAlarm.java
index 93e7c38f217bd6e0abbff1b536e59b4e141f208f..b9a03e0704254a92b0b98382d96f55dc7bfad1a6 100644 (file)
--- a/alarm/impl/src/main/java/org/opendaylight/netvirt/alarm/NvpnNbrControlPathAlarm.java
+++ b/alarm/impl/src/main/java/org/opendaylight/netvirt/alarm/NvpnNbrControlPathAlarm.java
@@ -30,9 +30,9 @@ public class NvpnNbrControlPathAlarm extends NotificationBroadcasterSupport impl
 
     private static final Logger LOG = LoggerFactory.getLogger(NvpnNbrControlPathAlarm.class);
 
-    private AtomicInteger sequenceNumber = new AtomicInteger(0);
+    private final AtomicInteger sequenceNumber = new AtomicInteger(0);
 
-    private ConcurrentMap<String, List<String>> raiseAlarmObjectMap = new ConcurrentHashMap<>();
+    private final ConcurrentMap<String, List<String>> raiseAlarmObjectMap = new ConcurrentHashMap<>();
 
     @Override
     public void raiseAlarm(String alarmName, String additionalText, String source, String detailsInfo) {
@@ -78,7 +78,7 @@ public class NvpnNbrControlPathAlarm extends NotificationBroadcasterSupport impl
 
     @Override
     public void handleNotification(NotificationListener listener, Notification notif, Object handback) {
-        AttributeChangeNotification attrib = null;
+        AttributeChangeNotification attrib;
         try {
             attrib = (AttributeChangeNotification) notif;
         } catch (ClassCastException e) {