commit b2b9427eb57b0f430b57d69fa27bb680b3699e9b
author Pankaj Berde <pankaj@onlab.us> Fri Jun 21 13:22:54 2013 -0700
committer Pankaj Berde <pankaj@onlab.us> Fri Jun 21 13:22:54 2013 -0700
tree bd67303145d7d02c80d31779f91b67e0ea0111d0
parent 85016abe605ea5d1822a8989e1545703cbeb208f
parent 535f21b103130eed97b5ed06e78de870be01f518

Merge pull request #398 from y-higuchi/swimpl_null_chk

Add null check against channel before accessing.

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

diff --git a/src/main/java/net/floodlightcontroller/core/internal/OFSwitchImpl.java b/src/main/java/net/floodlightcontroller/core/internal/OFSwitchImpl.java
index 0eca19c..467c74a 100644
--- a/src/main/java/net/floodlightcontroller/core/internal/OFSwitchImpl.java
+++ b/src/main/java/net/floodlightcontroller/core/internal/OFSwitchImpl.java
@@ -402,7 +402,7 @@
      */
     @Override
     public String toString() {
-        return "OFSwitchImpl [" + channel.getRemoteAddress() + " DPID[" + ((stringId != null) ? stringId : "?") + "]]";
+        return "OFSwitchImpl [" + ((channel != null) ? channel.getRemoteAddress() : "?") + " DPID[" + ((stringId != null) ? stringId : "?") + "]]";
     }
 
     @Override