From 505ca1cf096d0866e3ea6b82a441e3178b94db66 Mon Sep 17 00:00:00 2001 From: Alissa Bonas Date: Tue, 1 Oct 2013 14:35:12 +0300 Subject: [PATCH] Add curly braces to for and if statements. Change-Id: I1a681f0de1fe3f2b442d71612b4f15171df48ea2 Signed-off-by: Alissa Bonas --- .../neutron/implementation/NeutronPortInterface.java | 12 ++++++++---- .../networkconfig/neutron/NeutronSubnet.java | 3 ++- .../neutron/NeutronSubnet_IPAllocationPool.java | 3 ++- .../vendorextension/v6extension/V6FlowMod.java | 3 ++- .../vendorextension/v6extension/V6StatsReply.java | 3 ++- .../vendorextension/v6extension/V6StatsRequest.java | 6 ++++-- .../controller/sal/utils/SingletonTask.java | 6 ++++-- 7 files changed, 24 insertions(+), 12 deletions(-) diff --git a/opendaylight/networkconfiguration/neutron/implementation/src/main/java/org/opendaylight/controller/networkconfig/neutron/implementation/NeutronPortInterface.java b/opendaylight/networkconfiguration/neutron/implementation/src/main/java/org/opendaylight/controller/networkconfig/neutron/implementation/NeutronPortInterface.java index eea19776ec..273d420953 100644 --- a/opendaylight/networkconfiguration/neutron/implementation/src/main/java/org/opendaylight/controller/networkconfig/neutron/implementation/NeutronPortInterface.java +++ b/opendaylight/networkconfiguration/neutron/implementation/src/main/java/org/opendaylight/controller/networkconfig/neutron/implementation/NeutronPortInterface.java @@ -222,10 +222,12 @@ public class NeutronPortInterface implements INeutronPortCRUD { NeutronSubnet subnet = systemCRUD.getSubnet(ip.getSubnetUUID()); if (ip.getIpAddress() == null) ip.setIpAddress(subnet.getLowAddr()); - if (!ip.getIpAddress().equals(subnet.getGatewayIP())) + if (!ip.getIpAddress().equals(subnet.getGatewayIP())) { subnet.allocateIP(ip.getIpAddress()); - else + } + else { subnet.setGatewayIPAllocated(); + } subnet.addPort(input); } INeutronNetworkCRUD networkIf = NeutronCRUDInterfaces.getINeutronNetworkCRUD(this); @@ -249,10 +251,12 @@ public class NeutronPortInterface implements INeutronPortCRUD { while (fixedIPIterator.hasNext()) { Neutron_IPs ip = fixedIPIterator.next(); NeutronSubnet subnet = systemCRUD.getSubnet(ip.getSubnetUUID()); - if (!ip.getIpAddress().equals(subnet.getGatewayIP())) + if (!ip.getIpAddress().equals(subnet.getGatewayIP())) { subnet.releaseIP(ip.getIpAddress()); - else + } + else { subnet.resetGatewayIPAllocated(); + } subnet.removePort(port); } return true; diff --git a/opendaylight/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/NeutronSubnet.java b/opendaylight/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/NeutronSubnet.java index b1414c3730..1072a344b0 100644 --- a/opendaylight/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/NeutronSubnet.java +++ b/opendaylight/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/NeutronSubnet.java @@ -318,8 +318,9 @@ public class NeutronSubnet { Iterator i = allocationPools.iterator(); while (i.hasNext()) { NeutronSubnet_IPAllocationPool pool = i.next(); - if (ans == null) + if (ans == null) { ans = pool.getPoolStart(); + } else if (NeutronSubnet_IPAllocationPool.convert(pool.getPoolStart()) < NeutronSubnet_IPAllocationPool.convert(ans)) diff --git a/opendaylight/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/NeutronSubnet_IPAllocationPool.java b/opendaylight/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/NeutronSubnet_IPAllocationPool.java index 15401b7522..b4bbd11704 100644 --- a/opendaylight/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/NeutronSubnet_IPAllocationPool.java +++ b/opendaylight/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/NeutronSubnet_IPAllocationPool.java @@ -112,8 +112,9 @@ public class NeutronSubnet_IPAllocationPool { if (r.length == 0) return ""; StringBuilder sb = new StringBuilder(); int i; - for(i=0;i neoActions = new LinkedList(); - for (OFAction action : this.actions) + for (OFAction action : this.actions) { neoActions.add((OFAction) action.clone()); + } v6flowMod.setActions(neoActions); return v6flowMod; } catch (CloneNotSupportedException e) { diff --git a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/vendorextension/v6extension/V6StatsReply.java b/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/vendorextension/v6extension/V6StatsReply.java index f8c3d59bb3..3ae19838a2 100644 --- a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/vendorextension/v6extension/V6StatsReply.java +++ b/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/vendorextension/v6extension/V6StatsReply.java @@ -296,8 +296,9 @@ public class V6StatsReply extends OFVendorStatistics { * action list may be preceded by a padding of 0 to 7 bytes based upon this: */ short pad_size = (short) (((match_len + 7) / 8) * 8 - match_len); - for (i = 0; i < pad_size; i++) + for (i = 0; i < pad_size; i++) { data.get(); + } int action_len = this.length - MINIMUM_LENGTH - (match_len + pad_size); if (action_len > 0) this.actions = this.actionFactory.parseActions(data, action_len); diff --git a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/vendorextension/v6extension/V6StatsRequest.java b/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/vendorextension/v6extension/V6StatsRequest.java index 1644b1147b..d9c460b32e 100644 --- a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/vendorextension/v6extension/V6StatsRequest.java +++ b/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/vendorextension/v6extension/V6StatsRequest.java @@ -119,8 +119,9 @@ public class V6StatsRequest extends OFVendorStatistics { this.outPort = data.getShort(); this.match_len = data.getShort(); this.tableId = data.get(); - for (int i = 0; i < 3; i++) + for (int i = 0; i < 3; i++) { data.get();//pad byte + } } @@ -132,8 +133,9 @@ public class V6StatsRequest extends OFVendorStatistics { data.putShort(this.outPort); data.putShort(this.match_len); data.put(this.tableId); - for (int i = 0; i < 3; i++) + for (int i = 0; i < 3; i++) { data.put((byte) 0x0);//pad byte + } } @Override diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/utils/SingletonTask.java b/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/utils/SingletonTask.java index 634caac6ed..5d363f1285 100644 --- a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/utils/SingletonTask.java +++ b/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/utils/SingletonTask.java @@ -165,10 +165,12 @@ public class SingletonTask { } if (needQueue) { - if (delay <= 0) + if (delay <= 0) { ses.execute(stw); - else + } + else { ses.schedule(stw, delay, unit); + } } } } \ No newline at end of file -- 2.36.6