Merge "Bug fix for ForwardingRulesManager: addFlow and addFlowAsync are reversed."
authorAlessandro Boch <aboch@cisco.com>
Fri, 3 May 2013 13:59:01 +0000 (13:59 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Fri, 3 May 2013 13:59:01 +0000 (13:59 +0000)
opendaylight/forwardingrulesmanager/implementation/src/main/java/org/opendaylight/controller/forwardingrulesmanager/internal/ForwardingRulesManagerImpl.java

index 110d338..eee08d3 100644 (file)
@@ -604,9 +604,9 @@ public class ForwardingRulesManagerImpl implements IForwardingRulesManager,
     private Status addEntriesInternal(FlowEntryInstall entry, boolean async) {
         // Install the flow on the network node
         Status status = (async)?
-                programmer.addFlow(entry.getNode(), entry.getInstall()
-                        .getFlow()) :
                 programmer.addFlowAsync(entry.getNode(), entry.getInstall()
+                        .getFlow()) :
+                programmer.addFlow(entry.getNode(), entry.getInstall()
                             .getFlow());