Update MRI upstreams for Phosphorus

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

diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/multilayer/MultiLayerAggregateFlowMultipartService.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/multilayer/MultiLayerAggregateFlowMultipartService.java
index c2ebf4fbd5de6c4ac8b93b368262fff6e02d48bf..3093bc4302a5b0214b18d4efe56899dffa88816c 100644 (file)
--- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/multilayer/MultiLayerAggregateFlowMultipartService.java
+++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/multilayer/MultiLayerAggregateFlowMultipartService.java
@@ -70,10 +70,10 @@ public class MultiLayerAggregateFlowMultipartService extends AbstractAggregateFl
         final Uint8 tableId = MoreObjects.firstNonNull(input.getTableId(), OFConstants.OFPTT_ALL);
         mprAggregateRequestBuilder.setTableId(tableId);
         long outputPortValue = MoreObjects.firstNonNull(input.getOutPort(), OFConstants.OFPP_ANY).longValue();
-        mprAggregateRequestBuilder.setOutPort(outputPortValue);
+        mprAggregateRequestBuilder.setOutPort(Uint32.valueOf(outputPortValue));
 
-        final short version = getVersion();
-        if (version == OFConstants.OFP_VERSION_1_3) {
+        final Uint8 version = getVersion();
+        if (OFConstants.OFP_VERSION_1_3.equals(version)) {
 
             if (input.getCookie() == null) {
                 mprAggregateRequestBuilder.setCookie(OFConstants.DEFAULT_COOKIE);