commit 0b88a2644964a4f5e45463e3bd8d05b1bfe0929c
author Pavlin Radoslavov <pavlin@onlab.us> Thu Apr 10 15:43:27 2014 -0700
committer Pavlin Radoslavov <pavlin@onlab.us> Thu Apr 10 15:44:50 2014 -0700
tree 973fdc0a7dab0f5b7ea764c818255ac154fc14f2
parent 9526d6fd7f90cfc2bf2753f237adb0867932acfe

Fix issues found by FindBugs: BC_UNCONFIRMED_CAST

http://findbugs.sourceforge.net/bugDescriptions.html#BC_UNCONFIRMED_CAST

Change-Id: Ibd1019db95d85b316854be230473c716016d4275

src/main/java/net/onrc/onos/core/flowprogrammer/FlowProgrammer.java

diff --git a/src/main/java/net/onrc/onos/core/flowprogrammer/FlowProgrammer.java b/src/main/java/net/onrc/onos/core/flowprogrammer/FlowProgrammer.java
index ff3268e..4f6451e 100644
--- a/src/main/java/net/onrc/onos/core/flowprogrammer/FlowProgrammer.java
+++ b/src/main/java/net/onrc/onos/core/flowprogrammer/FlowProgrammer.java
@@ -133,15 +133,12 @@
 
     @Override
     public Command receive(IOFSwitch sw, OFMessage msg, FloodlightContext cntx) {
-        switch (msg.getType()) {
-            case FLOW_REMOVED:
-                OFFlowRemoved flowMsg = (OFFlowRemoved) msg;
-                FlowEntryId id = new FlowEntryId(flowMsg.getCookie());
-                log.debug("Got flow entry removed from {}: {}", sw.getId(), id);
-                // TODO: Inform the Forwarding module that a flow has expired
-                break;
-            default:
-                break;
+        if (msg.getType().equals(OFType.FLOW_REMOVED) &&
+            (msg instanceof OFFlowRemoved)) {
+            OFFlowRemoved flowMsg = (OFFlowRemoved) msg;
+            FlowEntryId id = new FlowEntryId(flowMsg.getCookie());
+            log.debug("Got flow entry removed from {}: {}", sw.getId(), id);
+            // TODO: Inform the Forwarding module that a flow has expired
         }
 
         return Command.CONTINUE;

src/main/java/net/onrc/onos/core/flowprogrammer/FlowPusher.java

diff --git a/src/main/java/net/onrc/onos/core/flowprogrammer/FlowPusher.java b/src/main/java/net/onrc/onos/core/flowprogrammer/FlowPusher.java
index 18a5753..56e4231 100644
--- a/src/main/java/net/onrc/onos/core/flowprogrammer/FlowPusher.java
+++ b/src/main/java/net/onrc/onos/core/flowprogrammer/FlowPusher.java
@@ -1079,7 +1079,8 @@
             log.trace("Received BARRIER_REPLY from : {}", sw.getId());
         }
 
-        if (msg.getType() != OFType.BARRIER_REPLY) {
+        if ((msg.getType() != OFType.BARRIER_REPLY) ||
+            !(msg instanceof OFBarrierReply)) {
             log.error("Unexpected reply message : {}", msg.getType());
             return Command.CONTINUE;
         }