Cleanup FlowMessageSerializer

[openflowplugin.git] / openflowplugin-impl / src / main / java / org / opendaylight / openflowplugin / impl / connection / HandshakeContextImpl.java

diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/connection/HandshakeContextImpl.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/connection/HandshakeContextImpl.java
index e7142642b85c6010eaac4735bbb8de3e379c771f..3b0779612fb46dc8f12ba59f54f13f9c84c96377 100644 (file)
--- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/connection/HandshakeContextImpl.java
+++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/connection/HandshakeContextImpl.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2015 Cisco Systems, Inc. and others.  All rights reserved.
  *
  * This program and the accompanying materials are made available under the
@@ -7,28 +7,21 @@
  */
 package org.opendaylight.openflowplugin.impl.connection;
 
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
+import java.util.concurrent.ExecutorService;
 import org.opendaylight.openflowplugin.api.openflow.connection.HandshakeContext;
 import org.opendaylight.openflowplugin.api.openflow.md.core.HandshakeManager;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
-/**
- *
- */
 public class HandshakeContextImpl implements HandshakeContext {
-
-    private static final Logger LOG = LoggerFactory.getLogger(HandshakeContextImpl.class);
-
-    private ThreadPoolExecutor handshakePool;
+    private ExecutorService handshakePool;
     private HandshakeManager handshakeManager;
 
     /**
-     * @param handshakePool
-     * @param handshakeManager
+     * Constructor.
+     *
+     * @param handshakePool - pool
+     * @param handshakeManager - manager
      */
-    public HandshakeContextImpl(ThreadPoolExecutor handshakePool, HandshakeManager handshakeManager) {
+    public HandshakeContextImpl(ExecutorService handshakePool, HandshakeManager handshakeManager) {
         this.handshakePool = handshakePool;
         this.handshakeManager = handshakeManager;
     }
@@ -39,28 +32,11 @@ public class HandshakeContextImpl implements HandshakeContext {
     }
 
     @Override
-    public ThreadPoolExecutor getHandshakePool() {
+    public ExecutorService getHandshakePool() {
         return handshakePool;
     }
 
     @Override
-    public void close() throws Exception {
-        shutdownPoolPolitely();
-    }
-
-    private void shutdownPoolPolitely() {
-        LOG.debug("terminating handshake pool");
-        handshakePool.shutdown();
-        try {
-            handshakePool.awaitTermination(1, TimeUnit.SECONDS);
-        } catch (InterruptedException e) {
-            LOG.error("Error while awaiting termination on pool. Will use shutdownNow method.");
-        } finally {
-            handshakePool.purge();
-            if (! handshakePool.isTerminated()) {
-                handshakePool.shutdownNow();
-            }
-            LOG.debug("pool is terminated: {}", handshakePool.isTerminated());
-        }
+    public void close() {
     }
 }