From 2b799cb8e72f65158e9e01fab3223b09025ceceb Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Tue, 26 May 2015 19:16:30 +0200 Subject: [PATCH] BUG-3157: performance tuning - Skip int->Integer boxing We really need the integer object, so don't keep it as a primitive type. Also make sure we run equals on a constant reference. Finally do not instantiate a zero integer. Change-Id: I64875984c66e6a2ae54d9ce3acefb529d500e4f2 Signed-off-by: Robert Varga --- .../md/core/sal/convertor/match/MatchConvertorImpl.java | 6 +++--- .../md/core/sal/convertor/match/MatchConvertorV10Impl.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/MatchConvertorImpl.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/MatchConvertorImpl.java index ad03deda13..84fb61722b 100644 --- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/MatchConvertorImpl.java +++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/MatchConvertorImpl.java @@ -356,7 +356,7 @@ public class MatchConvertorImpl implements MatchConvertor> { VlanVidCaseBuilder vlanVidCaseBuilder = new VlanVidCaseBuilder(); VlanVidBuilder vlanVidBuilder = new VlanVidBuilder(); boolean setCfiBit = false; - Integer vidEntryValue = new Integer(0); + Integer vidEntryValue = 0; boolean hasmask = false; if (Boolean.TRUE.equals(vlanId.isVlanIdPresent())) { setCfiBit = true; @@ -940,7 +940,7 @@ public class MatchConvertorImpl implements MatchConvertor> { ipv4PrefixStr += IpConversionUtil.PREFIX_SEPARATOR + "32"; } - if (!ipv4PrefixStr.equals(noIp)) { + if (!noIp.equals(ipv4PrefixStr)) { ipv4MatchBuilder.setIpv4Source(new Ipv4Prefix(ipv4PrefixStr)); matchBuilder.setLayer3Match(ipv4MatchBuilder.build()); } @@ -957,7 +957,7 @@ public class MatchConvertorImpl implements MatchConvertor> { ipv4PrefixStr += IpConversionUtil.PREFIX_SEPARATOR + "32"; } - if (!ipv4PrefixStr.equals(noIp)) { + if (!noIp.equals(ipv4PrefixStr)) { ipv4MatchBuilder.setIpv4Destination(new Ipv4Prefix(ipv4PrefixStr)); matchBuilder.setLayer3Match(ipv4MatchBuilder.build()); } diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/MatchConvertorV10Impl.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/MatchConvertorV10Impl.java index d3b65d7d0f..0a5a4b7a3f 100644 --- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/MatchConvertorV10Impl.java +++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/MatchConvertorV10Impl.java @@ -46,7 +46,7 @@ public class MatchConvertorV10Impl implements MatchConvertor { * The value 0xffff (OFP_VLAN_NONE) is used to indicate * that no VLAN ID is set for OF Flow. */ - private static final int OFP_VLAN_NONE = 0xffff; + private static final Integer OFP_VLAN_NONE = 0xffff; /** * Method builds openflow 1.0 specific match (MatchV10) from MD-SAL match. -- 2.36.6