Merge "Bug 3367 - StatManagerImpl scalable statPolling per stat type on device"

[openflowplugin.git] / openflowplugin / src / main / java / org / opendaylight / openflowplugin / openflow / md / core / HandshakeStepWrapper.java

diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/HandshakeStepWrapper.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/HandshakeStepWrapper.java
index 4f2f523b61f82cd1bafa790f562412df8433f6d7..35da23e9f17635e6cff62117ef5425427c48a501 100644 (file)
--- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/HandshakeStepWrapper.java
+++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/HandshakeStepWrapper.java
@@ -9,6 +9,7 @@
 package org.opendaylight.openflowplugin.openflow.md.core;
 
 import org.opendaylight.openflowjava.protocol.api.connection.ConnectionAdapter;
+import org.opendaylight.openflowplugin.api.openflow.md.core.HandshakeManager;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.HelloMessage;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -18,20 +19,20 @@ import org.slf4j.LoggerFactory;
  *
  */
 public class HandshakeStepWrapper implements Runnable {
-    
+
     private static final Logger LOG = LoggerFactory
             .getLogger(HandshakeStepWrapper.class);
-    
+
     private HelloMessage helloMessage;
     private HandshakeManager handshakeManager;
     private ConnectionAdapter connectionAdapter;
-    
-    
-    
+
+
+
     /**
      * @param helloMessage
      * @param handshakeManager
-     * @param connectionAdapter 
+     * @param connectionAdapter
      */
     public HandshakeStepWrapper(HelloMessage helloMessage,
             HandshakeManager handshakeManager, ConnectionAdapter connectionAdapter) {
@@ -43,8 +44,7 @@ public class HandshakeStepWrapper implements Runnable {
     @Override
     public void run() {
         if (connectionAdapter.isAlive()) {
-            handshakeManager.setReceivedHello(helloMessage);
-            handshakeManager.shake();
+            handshakeManager.shake(helloMessage);
         } else {
             LOG.debug("connection is down - skipping handshake step");
         }