diff --git a/openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/RoleManager.java b/openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/RoleManager.java
index e7e5ffe..bd4875c 100644
--- a/openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/RoleManager.java
+++ b/openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/RoleManager.java
@@ -213,8 +213,9 @@
             log.debug("Received unexpected RoleReply {} from "
                     + "Switch: {}. "
                     + "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;
         }
 
@@ -232,7 +233,7 @@
         if (expectedRole == receivedRole) {
             log.debug("Received role reply message from {} that matched "
                     + "expected role-reply {} with expectations {}",
-                    new Object[] {sw.getStringId(), receivedRole, expectation});
+                    sw.getStringId(), receivedRole, expectation);
 
             // Done with this RoleReply; Invalidate
             pendingReplies.invalidate(xid);
@@ -283,10 +284,10 @@
             log.error("Received a error msg {} from sw {} for "
                     + "pending role request {}. Switch driver indicates "
                     + "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;
         }
 
