Log switch description strings

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

@@ -773,13 +773,13 @@ public class Controller implements IFloodlightProviderService,
             sw.setSwitchProperties(state.description);
             readPropertyFromStorage();
 
+            log.info("Switch {} bound to class {}",
+                    HexString.toHexString(sw.getId()), sw.getClass().getName());
+            log.info("{}", state.description);
+
             state.featuresReply = null;
             state.description = null;
             state.switchBindingDone = true;
-
-            log.info("Switch {} bound to class {}",
-                    HexString.toHexString(sw.getId()), sw.getClass().getName());
-            return;
         }
         
        private void readPropertyFromStorage() {

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

@@ -296,15 +296,15 @@ public class RoleChanger {
         while(iter.hasNext()) {
             IOFSwitch sw = iter.next();
             try {
-                int xid = sendHARoleRequest(sw, role, cookie);
-                PendingRoleRequestEntry entry =
-                        new PendingRoleRequestEntry(xid, role, cookie);
                 LinkedList<PendingRoleRequestEntry> pendingList
                     = pendingRequestMap.get(sw);
                 if (pendingList == null) {
                     pendingList = new LinkedList<PendingRoleRequestEntry>();
                     pendingRequestMap.put(sw, pendingList);
                 }
+                int xid = sendHARoleRequest(sw, role, cookie);
+                PendingRoleRequestEntry entry =
+                        new PendingRoleRequestEntry(xid, role, cookie);
                 // Need to synchronize against removal from list
                 synchronized(pendingList) {
                     pendingList.add(entry);

src/main/java/org/openflow/protocol/statistics/OFDescriptionStatistics.java

@@ -213,4 +213,13 @@ public class OFDescriptionStatistics implements OFStatistics {
         }
         return true;
     }
+
+    @Override
+    public String toString() {
+        return "Switch Desc - Vendor: " +  manufacturerDescription +
+                "  Model: " + hardwareDescription +
+                "  Make: " + datapathDescription +
+                "  Version: " + softwareDescription +
+                "  S/N: " + serialNumber;
+    }
 }