Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Simplify ListenableFuture translation
[controller.git]
/
opendaylight
/
md-sal
/
sal-remoterpc-connector
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
remote
/
rpc
/
utils
/
LatestEntryRoutingLogic.java
diff --git
a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/utils/LatestEntryRoutingLogic.java
b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/utils/LatestEntryRoutingLogic.java
index c0e2973aab53c48e92329d2d96487d277d25531e..f7b36a776e74af78b80b86837be5951b318b20a0 100644
(file)
--- a/
opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/utils/LatestEntryRoutingLogic.java
+++ b/
opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/utils/LatestEntryRoutingLogic.java
@@
-11,6
+11,7
@@
package org.opendaylight.controller.remote.rpc.utils;
import akka.actor.ActorRef;
import akka.japi.Pair;
import com.google.common.base.Preconditions;
import akka.actor.ActorRef;
import akka.japi.Pair;
import com.google.common.base.Preconditions;
+import java.io.Serializable;
import java.util.Collection;
import java.util.Comparator;
import java.util.SortedSet;
import java.util.Collection;
import java.util.Comparator;
import java.util.SortedSet;
@@
-36,22
+37,28
@@
public class LatestEntryRoutingLogic implements RoutingLogic {
return actorRefSet.last().first();
}
return actorRefSet.last().first();
}
- private class LatestEntryComparator implements Comparator<Pair<ActorRef, Long>> {
+ private static class LatestEntryComparator implements Comparator<Pair<ActorRef, Long>>, Serializable {
+ private static final long serialVersionUID = 1L;
@Override
public int compare(Pair<ActorRef, Long> o1, Pair<ActorRef, Long> o2) {
if (o1 == null && o2 == null) {
return 0;
}
@Override
public int compare(Pair<ActorRef, Long> o1, Pair<ActorRef, Long> o2) {
if (o1 == null && o2 == null) {
return 0;
}
- if (o1 == null && o2 != null) {
+
+ if (o1 != null && o2 != null && o1.second() == null && o2.second() == null) {
+ return 0;
+ }
+
+ if ((o1 == null || o1.second() == null) && o2 != null) {
return -1;
}
return -1;
}
- if (o1 != null && o2 == null) {
+
+ if (o2 == null || o2.second() == null) {
return 1;
}
return o1.second().compareTo(o2.second());
return 1;
}
return o1.second().compareTo(o2.second());
-
}
}
}
}
}
}