commit 7e7c270953aa3020a8c6a390d7e47442ac7a386d
author Umesh Krishnaswamy <krishji@gmail.com> Tue Mar 26 13:08:52 2013 -0700
committer Umesh Krishnaswamy <krishji@gmail.com> Tue Mar 26 13:08:52 2013 -0700
tree 6c4fac025e8844be8fab1dc4f3f3d3dc815dcd64
parent 4572c055995d387988e861982509f38ac27973dc
parent 13e2ebe848ea962f61b9e06723713cd00222ed65

Merge branch 'master' of https://github.com/OPENNETWORKINGLAB/ONOS

src/main/java/net/floodlightcontroller/core/internal/OpenflowPipelineFactory.java

diff --git a/src/main/java/net/floodlightcontroller/core/internal/OpenflowPipelineFactory.java b/src/main/java/net/floodlightcontroller/core/internal/OpenflowPipelineFactory.java
index 5fb5c34..4485709 100644
--- a/src/main/java/net/floodlightcontroller/core/internal/OpenflowPipelineFactory.java
+++ b/src/main/java/net/floodlightcontroller/core/internal/OpenflowPipelineFactory.java
@@ -60,7 +60,7 @@
         pipeline.addLast("idle", idleHandler);
         pipeline.addLast("timeout", readTimeoutHandler);
         pipeline.addLast("handshaketimeout",
-                         new HandshakeTimeoutHandler(state, timer, 15));
+                         new HandshakeTimeoutHandler(state, timer, 60)); // ONOS: was 15 increased it to fix Issue #296
         if (pipelineExecutor != null)
             pipeline.addLast("pipelineExecutor",
                              new ExecutionHandler(pipelineExecutor));