Bug 2177 - Updated SwitchConnectionProviderImpl

[openflowjava.git] / openflow-protocol-impl / src / main / java / org / opendaylight / openflowjava / protocol / impl / connection / SwitchConnectionProviderImpl.java

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/connection/SwitchConnectionProviderImpl.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/connection/SwitchConnectionProviderImpl.java
index c2072ba51535c387c4397370192c5c1418ffc30a..75f698c44085bf9605e8e04fa6c1b11e00c21dca 100644 (file)
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/connection/SwitchConnectionProviderImpl.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/connection/SwitchConnectionProviderImpl.java
@@ -105,19 +105,11 @@ public class SwitchConnectionProviderImpl implements SwitchConnectionProvider {
     @Override
     public ListenableFuture<Boolean> startup() {
         LOGGER.debug("Startup summoned");
-        serverFacade = createAndConfigureServer();
-        
-        LOGGER.debug("Starting ..");
         ListenableFuture<Boolean> result = null;
         try {
-            if (serverFacade == null) {
-                throw new IllegalStateException("No server configured");
-            }
-            if (serverFacade.getIsOnlineFuture().isDone()) {
-                throw new IllegalStateException("Server already running");
-            }
+            serverFacade = createAndConfigureServer();
             if (switchConnectionHandler == null) {
-                throw new IllegalStateException("switchConnectionHandler is not set");
+                throw new IllegalStateException("SwitchConnectionHandler is not set");
             }
             new Thread(serverFacade).start();
             result = serverFacade.getIsOnlineFuture();
@@ -145,9 +137,11 @@ public class SwitchConnectionProviderImpl implements SwitchConnectionProvider {
         if (transportProtocol.equals(TransportProtocol.TCP) || transportProtocol.equals(TransportProtocol.TLS)) {
             server = new TcpHandler(connConfig.getAddress(), connConfig.getPort());
             ((TcpHandler) server).setChannelInitializer(factory.createPublishingChannelInitializer());
-        } else {
+        } else if (transportProtocol.equals(TransportProtocol.UDP)){
             server = new UdpHandler(connConfig.getAddress(), connConfig.getPort());
             ((UdpHandler) server).setChannelInitializer(factory.createUdpChannelInitializer());
+        } else {
+            throw new IllegalStateException("Unknown transport protocol received: " + transportProtocol);
         }
         server.setThreadConfig(connConfig.getThreadConfiguration());
         return server;