Remove redundant Object[] declarations in variable argument lists

Change-Id: I34b8e183c3f57a04a84b2cbc061e7071ec466887

@@ -445,7 +445,7 @@ class OFChannelHandler extends IdleStateAwareChannelHandler {
 
 
 
 
                 log.debug("Switch {} bound to class {}, description {}",
                 log.debug("Switch {} bound to class {}, description {}",
-                        new Object[] {h.sw, h.sw.getClass(), drep });
+                        h.sw, h.sw.getClass(), drep);
                 //Put switch in EQUAL mode until we hear back from the global registry
                 //Put switch in EQUAL mode until we hear back from the global registry
                 //log.debug("Setting new switch {} to EQUAL and sending Role request",
                 //log.debug("Setting new switch {} to EQUAL and sending Role request",
                 //        h.sw.getStringId());
                 //        h.sw.getStringId());
@@ -730,10 +730,9 @@ class OFChannelHandler extends IdleStateAwareChannelHandler {
          */
          */
         protected void logError(OFChannelHandler h, OFErrorMsg error) {
         protected void logError(OFChannelHandler h, OFErrorMsg error) {
             log.error("{} from switch {} in state {}",
             log.error("{} from switch {} in state {}",
-                    new Object[] {
                     error,
                     error,
                     h.getSwitchInfoString(),
                     h.getSwitchInfoString(),
-                    this.toString()});
+                    this.toString());
         }
         }
 
 
         /**
         /**

@@ -498,10 +498,10 @@ public class OpenFlowControllerImpl implements OpenFlowController {
                     activeEqualSwitches.get(dpid) != null) {
                     activeEqualSwitches.get(dpid) != null) {
                 log.error("Trying to activate switch but it is already "
                 log.error("Trying to activate switch but it is already "
                         + "activated: dpid {}. Found in activeMaster: {} "
                         + "activated: dpid {}. Found in activeMaster: {} "
-                        + "Found in activeEqual: {}. Aborting ..", new Object[]{
-                                dpid,
-                                (activeMasterSwitches.get(dpid) == null) ? 'N' : 'Y',
-                                        (activeEqualSwitches.get(dpid) == null) ? 'N' : 'Y'});
+                        + "Found in activeEqual: {}. Aborting ..",
+                          dpid,
+                          (activeMasterSwitches.get(dpid) == null) ? 'N' : 'Y',
+                          (activeEqualSwitches.get(dpid) == null) ? 'N' : 'Y');
                 return false;
                 return false;
             }
             }
             return true;
             return true;

@@ -213,8 +213,9 @@ class RoleManager implements RoleHandler {
             log.debug("Received unexpected RoleReply {} from "
             log.debug("Received unexpected RoleReply {} from "
                     + "Switch: {}. "
                     + "Switch: {}. "
                     + "This controller has no current role for this sw. "
                     + "This controller has no current role for this sw. "
-                    + "Ignoring ...", new Object[] {rri,
-                            sw == null ? "(null)" : sw.getStringId(), });
+                    + "Ignoring ...",
+                      rri,
+                      sw == null ? "(null)" : sw.getStringId());
             return RoleRecvStatus.OTHER_EXPECTATION;
             return RoleRecvStatus.OTHER_EXPECTATION;
         }
         }
 
 
@@ -232,7 +233,7 @@ class RoleManager implements RoleHandler {
         if (expectedRole == receivedRole) {
         if (expectedRole == receivedRole) {
             log.debug("Received role reply message from {} that matched "
             log.debug("Received role reply message from {} that matched "
                     + "expected role-reply {} with expectations {}",
                     + "expected role-reply {} with expectations {}",
-                    new Object[] {sw.getStringId(), receivedRole, expectation});
+                    sw.getStringId(), receivedRole, expectation);
 
 
             // Done with this RoleReply; Invalidate
             // Done with this RoleReply; Invalidate
             pendingReplies.invalidate(xid);
             pendingReplies.invalidate(xid);
@@ -283,10 +284,10 @@ class RoleManager implements RoleHandler {
             log.error("Received a error msg {} from sw {} for "
             log.error("Received a error msg {} from sw {} for "
                     + "pending role request {}. Switch driver indicates "
                     + "pending role request {}. Switch driver indicates "
                     + "role-messaging is supported. Possible issues in "
                     + "role-messaging is supported. Possible issues in "
-                    + "switch driver configuration?", new Object[] {
-                            ((OFBadRequestErrorMsg) error).toString(),
-                            sw.getStringId(), errorRole
-                    });
+                    + "switch driver configuration?",
+                    ((OFBadRequestErrorMsg) error).toString(),
+                    sw.getStringId(),
+                    errorRole);
             return RoleRecvStatus.UNSUPPORTED;
             return RoleRecvStatus.UNSUPPORTED;
         }
         }