| commit | 241b96accd69fbee4a949446a99a1c2fee3b952e | [log] [tgz] |
|---|---|---|
| author | Ray Milkey <ray@onlab.us> | Mon Nov 17 13:08:20 2014 -0800 |
| committer | Ray Milkey <ray@onlab.us> | Mon Nov 17 16:38:30 2014 -0800 |
| tree | 38cfbcb338c4215784776adcc716a026bfec51a7 | |
| parent | 5dfa43f4b925073bc0aa4d2d1acd5b14874d87cf [diff] |
Fix high priority findbugs reported issues Fixed some code that was reporting findbugs errors Implemented a suppression mechanism for findbugs reported errors and a suppression file. Change-Id: Ie8a2e84cc57ec6ddfa14d782ee89feb095b9dd59
diff --git a/openflow/ctl/src/main/java/org/onlab/onos/openflow/controller/impl/RoleManager.java b/openflow/ctl/src/main/java/org/onlab/onos/openflow/controller/impl/RoleManager.java index 734e0ba..51e90e5 100644 --- a/openflow/ctl/src/main/java/org/onlab/onos/openflow/controller/impl/RoleManager.java +++ b/openflow/ctl/src/main/java/org/onlab/onos/openflow/controller/impl/RoleManager.java
@@ -216,7 +216,7 @@ + "Switch: {}. " + "This controller has no current role for this sw. " + "Ignoring ...", new Object[] {rri, - sw.getStringId(), }); + sw == null ? "(null)" : sw.getStringId(), }); return RoleRecvStatus.OTHER_EXPECTATION; }
diff --git a/openflow/ctl/src/main/java/org/onlab/onos/openflow/drivers/impl/OFSwitchImplCPqD13.java b/openflow/ctl/src/main/java/org/onlab/onos/openflow/drivers/impl/OFSwitchImplCPqD13.java index f5aa0d4..0905f43 100644 --- a/openflow/ctl/src/main/java/org/onlab/onos/openflow/drivers/impl/OFSwitchImplCPqD13.java +++ b/openflow/ctl/src/main/java/org/onlab/onos/openflow/drivers/impl/OFSwitchImplCPqD13.java
@@ -155,7 +155,7 @@ @Override public void processDriverHandshakeMessage(OFMessage m) { - if (!startDriverHandshakeCalled || !startDriverHandshakeCalled) { + if (!startDriverHandshakeCalled) { throw new SwitchDriverSubHandshakeNotStarted(); } if (driverHandshakeComplete.get()) {