X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=openflowplugin%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fopenflowplugin%2Fopenflow%2Fmd%2Fcore%2Fsession%2FOFRoleManager.java;h=fa5f7a519b94074d1e92f26e7ec3c1b7ba1260c8;hb=436d3b53fa2293b6d11348732db9bcc371e80642;hp=a7bce0e6d2a55dbab2184413bb312e42567a12e1;hpb=9dd9664db32bd7fa972bd414fb4e02ec83ad8e83;p=openflowplugin.git diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/session/OFRoleManager.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/session/OFRoleManager.java index a7bce0e6d2..fa5f7a519b 100644 --- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/session/OFRoleManager.java +++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/session/OFRoleManager.java @@ -7,7 +7,7 @@ */ package org.opendaylight.openflowplugin.openflow.md.core.session; -import com.google.common.base.Objects; +import com.google.common.base.MoreObjects; import com.google.common.base.Preconditions; import com.google.common.util.concurrent.CheckedFuture; import com.google.common.util.concurrent.ListenableFuture; @@ -53,14 +53,14 @@ public class OFRoleManager implements AutoCloseable { private final SessionManager sessionManager; /** - * @param sessionManager + * @param sessionManager switch connection session manager */ - public OFRoleManager(SessionManager sessionManager) { + public OFRoleManager(final SessionManager sessionManager) { Preconditions.checkNotNull("Session manager can not be empty.", sessionManager); this.sessionManager = sessionManager; workQueue = new PriorityBlockingQueue<>(500, new Comparator() { @Override - public int compare(RolePushTask o1, RolePushTask o2) { + public int compare(final RolePushTask o1, final RolePushTask o2) { return Integer.compare(o1.getPriority(), o2.getPriority()); } }); @@ -73,7 +73,7 @@ public class OFRoleManager implements AutoCloseable { /** * change role on each connected device * - * @param role + * @param role openflow role */ public void manageRoleChange(final OfpRole role) { for (final SessionContext session : sessionManager.getAllSessions()) { @@ -91,7 +91,7 @@ public class OFRoleManager implements AutoCloseable { RoleUtil.makeCheckedRuleRequestFxResult(rolePushResult); try { Boolean succeeded = rolePushResultChecked.checkedGet(TIMEOUT, TIMEOUT_UNIT); - if (!Objects.firstNonNull(succeeded, Boolean.FALSE)) { + if (!MoreObjects.firstNonNull(succeeded, Boolean.FALSE)) { if (task.getRetryCounter() < RETRY_LIMIT) { workQueue.offer(task); }