OPNFLWPLUG-1032: Neon-MRI: Bump odlparent, yangtools, mdsal

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

diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/AbstractMultipartCollectorService.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/AbstractMultipartCollectorService.java
index c643bf8aaf8d37fa2e14efb3de038346194e22d1..5d5a2eca933a92e26e597cba1b9bcb01e02a17cb 100644 (file)
--- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/AbstractMultipartCollectorService.java
+++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/AbstractMultipartCollectorService.java
@@ -20,9 +20,11 @@ import org.opendaylight.openflowplugin.impl.util.DeviceInitializationUtil;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.MultipartType;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.OfHeader;
 
-public abstract class AbstractMultipartCollectorService<T extends OfHeader> extends AbstractMultipartService<MultipartType, T> {
+public abstract class AbstractMultipartCollectorService<T extends OfHeader>
+        extends AbstractMultipartService<MultipartType, T> {
 
-    protected AbstractMultipartCollectorService(final RequestContextStack requestContextStack, final DeviceContext deviceContext) {
+    protected AbstractMultipartCollectorService(final RequestContextStack requestContextStack,
+                                                final DeviceContext deviceContext) {
         super(requestContextStack, deviceContext);
     }
 
@@ -37,7 +39,7 @@ public abstract class AbstractMultipartCollectorService<T extends OfHeader> exte
             }
 
             @Override
-            public void onFailure(@Nonnull final Throwable t) {
+            public void onFailure(@Nonnull final Throwable throwable) {
                 // If we failed getting table features, at least create empty tables
                 if (MultipartType.OFPMPTABLEFEATURES.getClass().equals(requestType)) {
                     DeviceInitializationUtil.makeEmptyTables(
@@ -46,13 +48,16 @@ public abstract class AbstractMultipartCollectorService<T extends OfHeader> exte
                         getDeviceContext().getPrimaryConnectionContext().getFeatures().getTables());
                 }
 
-                callback.onFailure(t);
+                callback.onFailure(throwable);
             }
         };
     }
 
     @Override
     protected OfHeader buildRequest(final Xid xid, final MultipartType input) {
-        return MultipartRequestInputFactory.makeMultipartRequestInput(xid.getValue(), getVersion(), input);
+        return MultipartRequestInputFactory.makeMultipartRequest(xid.getValue(),
+                                                                 getVersion(),
+                                                                 input,
+                                                                 canUseSingleLayerSerialization());
     }
 }