From: melserngawy <melserngawy@inocybe.com>
Date: Thu, 1 Jun 2017 17:35:07 +0000 (-0400)
Subject: Check for transport protocol confi
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=openflowjava.git;a=commitdiff_plain;h=e7e9481d7ed14a41da06b4143bf80a8ca87a1e36

Check for transport protocol confi

For some reason the TransportProtocol config
has a null value at the following jenkins job

https://jenkins.opendaylight.org/releng/job/aaa-distribution-check-nitrogen/139/console

    - flipped equals, now null is on slow path

Change-Id: I38c2bb0676d4553452f9ae630554b6c99d445ef4
Signed-off-by: melserngawy <m.elserngawy@gmail.com>
Signed-off-by: Michal Rehak <michal.rehak@pantheon.tech>
---

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/SwitchConnectionProviderImpl.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/SwitchConnectionProviderImpl.java
index afa47644..612afcb7 100755
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/SwitchConnectionProviderImpl.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/SwitchConnectionProviderImpl.java
@@ -142,7 +142,7 @@ public class SwitchConnectionProviderImpl implements SwitchConnectionProvider, C
         // TODO : Add option to disable Epoll.
         boolean isEpollEnabled = Epoll.isAvailable();
 
-        if (transportProtocol.equals(TransportProtocol.TCP) || transportProtocol.equals(TransportProtocol.TLS)) {
+        if ((TransportProtocol.TCP.equals(transportProtocol) || TransportProtocol.TLS.equals(transportProtocol))) {
             server = new TcpHandler(connConfig.getAddress(), connConfig.getPort());
             final TcpChannelInitializer channelInitializer = factory.createPublishingChannelInitializer();
             ((TcpHandler) server).setChannelInitializer(channelInitializer);
@@ -152,7 +152,7 @@ public class SwitchConnectionProviderImpl implements SwitchConnectionProvider, C
             connectionInitializer = new TcpConnectionInitializer(workerGroupFromTcpHandler, isEpollEnabled);
             connectionInitializer.setChannelInitializer(channelInitializer);
             connectionInitializer.run();
-        } else if (transportProtocol.equals(TransportProtocol.UDP)){
+        } else if (TransportProtocol.UDP.equals(transportProtocol)){
             server = new UdpHandler(connConfig.getAddress(), connConfig.getPort());
             ((UdpHandler) server).initiateEventLoopGroups(connConfig.getThreadConfiguration(), isEpollEnabled);
             ((UdpHandler) server).setChannelInitializer(factory.createUdpChannelInitializer());