Add flow pushing rules.

[affinity.git] / affinity / implementation / src / main / java / org / opendaylight / affinity / affinity / internal / AffinityManagerImpl.java

diff --git a/affinity/implementation/src/main/java/org/opendaylight/affinity/affinity/internal/AffinityManagerImpl.java b/affinity/implementation/src/main/java/org/opendaylight/affinity/affinity/internal/AffinityManagerImpl.java
index ce0325d0727114de303dacd3e5f610dce848d8b1..7f7f2a409ee0a1db2b8270e4463adb39287b95e8 100644 (file)
--- a/affinity/implementation/src/main/java/org/opendaylight/affinity/affinity/internal/AffinityManagerImpl.java
+++ b/affinity/implementation/src/main/java/org/opendaylight/affinity/affinity/internal/AffinityManagerImpl.java
@@ -90,7 +90,6 @@ import org.opendaylight.controller.hosttracker.IfIptoHost;
 import org.opendaylight.controller.hosttracker.hostAware.HostNodeConnector;
 import org.opendaylight.controller.switchmanager.ISwitchManager;
 import org.opendaylight.affinity.l2agent.L2Agent;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -245,12 +244,20 @@ public class AffinityManagerImpl implements IAffinityManager, IConfigurationCont
             this.fps = null;
         }
     }
+<<<<<<< HEAD
     public void setL2Agent(L2Agent s)
+=======
+    public void setL2Agent(TutorialL2Forwarding s)
+>>>>>>> Add flow pushing rules.
     {
         this.l2agent = s;
     }
 
+<<<<<<< HEAD
     public void unsetL2Agent(L2Agent s) {
+=======
+    public void unsetL2Agent(TutorialL2Forwarding s) {
+>>>>>>> Add flow pushing rules.
         if (this.l2agent == s) {
             this.l2agent = null;
         }