Moving a recently added trim() call in SwitchHandler after Null check.

[controller.git] / opendaylight / protocol_plugins / openflow / src / main / java / org / opendaylight / controller / protocol_plugin / openflow / core / internal / SwitchHandler.java

diff --git a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/core/internal/SwitchHandler.java b/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/core/internal/SwitchHandler.java
index 78ab3275a4ac674333f8b4cb26464b61488d2cda..cba8b1d4f17c38a9d232e1b54a3463c96cfe8dbf 100644 (file)
--- a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/core/internal/SwitchHandler.java
+++ b/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/core/internal/SwitchHandler.java
@@ -781,8 +781,8 @@ public class SwitchHandler implements ISwitch {
     }
     
     private IMessageReadWrite getMessageReadWriteService() throws Exception {
-       String str = System.getProperty("secureChannelEnabled").trim();
-        return ((str != null) && (str.equalsIgnoreCase("true"))) ? 
+       String str = System.getProperty("secureChannelEnabled");
+        return ((str != null) && (str.trim().equalsIgnoreCase("true"))) ? 
                        new SecureMessageReadWriteService(socket, selector) : 
                        new MessageReadWriteService(socket, selector);
     }