Rework bit-copying functions and re-enable tests

[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 a1b5e19..64f1070
--- 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
@@ -96,7 +96,7 @@ public abstract class AbstractMultipartRequestOnTheFlyCallback<T extends OfHeade
                                         .ifPresent(writer -> writer.write(reply, false));
                             } catch (final Exception ex) {
                                 LOG.warn("Stats processing of type {} for node {} failed during write-to-tx step",
-                                        getMultipartType(), deviceInfo.getLOGValue(), ex);
+                                        getMultipartType(), deviceInfo, ex);
                             }
                         });
             } catch (final Exception ex) {
@@ -140,18 +140,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