Merge "fix diagstatus NPE on showSvcStatus CLI"

diff --git a/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/diagstatus/OpenflowPluginDiagStatusProvider.java b/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/diagstatus/OpenflowPluginDiagStatusProvider.java
index 39a13f6bd8e93f30f40db5979fa0c4835f72745f..ab8f904616614609be04bb15a832db81ec6ed177 100644 (file)
--- a/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/diagstatus/OpenflowPluginDiagStatusProvider.java
+++ b/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/diagstatus/OpenflowPluginDiagStatusProvider.java
@@ -29,7 +29,6 @@ public class OpenflowPluginDiagStatusProvider implements ServiceStatusProvider {
     private final DiagStatusService diagStatusService;
     private InetAddress defaultInetAddres;
     private InetAddress legacyInetAddress;
-    private volatile ServiceDescriptor serviceDescriptor;
 
     public OpenflowPluginDiagStatusProvider(final DiagStatusService diagStatusService,
                                             final List<SwitchConnectionProvider> switchConnectionProviders) {
@@ -50,24 +49,19 @@ public class OpenflowPluginDiagStatusProvider implements ServiceStatusProvider {
 
     public void reportStatus(ServiceState serviceState, String description) {
         LOG.debug("reporting status as {} for {}", serviceState, OPENFLOW_SERVICE_NAME);
-        serviceDescriptor = new ServiceDescriptor(OPENFLOW_SERVICE_NAME, serviceState, description);
-        diagStatusService.report(serviceDescriptor);
+        diagStatusService.report(new ServiceDescriptor(OPENFLOW_SERVICE_NAME, serviceState, description));
     }
 
     @Override
     public ServiceDescriptor getServiceDescriptor() {
-
-        if (serviceDescriptor.getServiceState().equals(ServiceState.OPERATIONAL)) {
-            if (getApplicationNetworkState(OF_PORT_13, defaultInetAddres)
-                    && getApplicationNetworkState(OF_PORT_11, legacyInetAddress)) {
-                return serviceDescriptor;
-            } else {
-                serviceDescriptor = new ServiceDescriptor(OPENFLOW_SERVICE_NAME, ServiceState.ERROR,
-                        "OF::PORTS:: 6653 and 6633 are not up yet");
-                return serviceDescriptor;
-            }
+        if (getApplicationNetworkState(OF_PORT_13, defaultInetAddres)
+                && getApplicationNetworkState(OF_PORT_11, legacyInetAddress)) {
+            return new ServiceDescriptor(OPENFLOW_SERVICE_NAME, ServiceState.OPERATIONAL,
+                    "OF::PORTS:: 6653 and 6633 are up.");
+        } else {
+            return new ServiceDescriptor(OPENFLOW_SERVICE_NAME, ServiceState.ERROR,
+                    "OF::PORTS:: 6653 and 6633 are not up yet");
         }
-        return serviceDescriptor;
     }
 
     private boolean getApplicationNetworkState(int port, InetAddress inetAddress) {