Merge branch 'master' of https://github.com/OPENNETWORKINGLAB/ONOS into RAMCloud
diff --git a/src/main/java/net/onrc/onos/ofcontroller/flowmanager/FlowManager.java b/src/main/java/net/onrc/onos/ofcontroller/flowmanager/FlowManager.java
index aa227a1..9782a08 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/flowmanager/FlowManager.java
+++ b/src/main/java/net/onrc/onos/ofcontroller/flowmanager/FlowManager.java
@@ -516,6 +516,15 @@
 	    if (mySwitch == null)
 		continue;
 
+	    if (flowEntry.flowEntrySwitchState() ==
+		FlowEntrySwitchState.FE_SWITCH_UPDATED) {
+		//
+		// Don't push again Flow Entries that were already already
+		// installed into the switches.
+		//
+		continue;
+	    }
+
 	    //
 	    // Assign Flow Entry IDs if missing.
 	    //