OPNFLWPLUG-1087: ODL controller to provide view of openflow node reconciliation status

[openflowplugin.git] / openflowplugin-impl / src / main / java / org / opendaylight / openflowplugin / impl / services / AbstractMultipartRequestOnTheFlyCallback.java

diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/AbstractMultipartRequestOnTheFlyCallback.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/AbstractMultipartRequestOnTheFlyCallback.java
old mode 100644 (file)
new mode 100755 (executable)
index 6da5d83..038612c
--- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/AbstractMultipartRequestOnTheFlyCallback.java
+++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/AbstractMultipartRequestOnTheFlyCallback.java
@@ -10,7 +10,6 @@ package org.opendaylight.openflowplugin.impl.services;
 import com.google.common.util.concurrent.Service;
 import java.util.Collections;
 import java.util.List;
-import java.util.Objects;
 import org.opendaylight.openflowplugin.api.openflow.device.DeviceContext;
 import org.opendaylight.openflowplugin.api.openflow.device.DeviceInfo;
 import org.opendaylight.openflowplugin.api.openflow.device.DeviceRegistry;
@@ -41,7 +40,7 @@ public abstract class AbstractMultipartRequestOnTheFlyCallback<T extends OfHeade
     private final MultipartWriterProvider statisticsWriterProvider;
     private final DeviceRegistry deviceRegistry;
     private volatile Service.State gatheringState = Service.State.NEW;
-    private ConvertorExecutor convertorExecutor;
+    private final ConvertorExecutor convertorExecutor;
 
     public AbstractMultipartRequestOnTheFlyCallback(final RequestContext<List<T>> context, Class<?> requestType,
                                                     final DeviceContext deviceContext,
@@ -61,7 +60,7 @@ public abstract class AbstractMultipartRequestOnTheFlyCallback<T extends OfHeade
     @Override
     @SuppressWarnings({"unchecked", "checkstyle:IllegalCatch"})
     public void onSuccess(final OfHeader result) {
-        if (Objects.isNull(result)) {
+        if (result == null) {
             LOG.warn("Response received was null.");
 
             if (!Service.State.TERMINATED.equals(gatheringState)) {
@@ -70,7 +69,7 @@ public abstract class AbstractMultipartRequestOnTheFlyCallback<T extends OfHeade
 
             return;
         } else if (Service.State.TERMINATED.equals(gatheringState)) {
-            LOG.warn("Unexpected response received: xid={}, {}", result.getXid(), result.getImplementedInterface());
+            LOG.warn("Unexpected response received: xid={}, {}", result.getXid(), result.implementedInterface());
             return;
         }
 
@@ -140,18 +139,21 @@ public abstract class AbstractMultipartRequestOnTheFlyCallback<T extends OfHeade
                         getTxFacade(),
                         instanceIdentifier,
                         deviceRegistry.getDeviceFlowRegistry());
+                deviceRegistry.getDeviceFlowRegistry().processMarks();
                 break;
             case OFPMPMETERCONFIG:
                 StatisticsGatheringUtils.deleteAllKnownMeters(
                         getTxFacade(),
                         instanceIdentifier,
                         deviceRegistry.getDeviceMeterRegistry());
+                deviceRegistry.getDeviceMeterRegistry().processMarks();
                 break;
             case OFPMPGROUPDESC:
                 StatisticsGatheringUtils.deleteAllKnownGroups(
                         getTxFacade(),
                         instanceIdentifier,
                         deviceRegistry.getDeviceGroupRegistry());
+                deviceRegistry.getDeviceGroupRegistry().processMarks();
                 break;
             default:
                 // no operation