Repository: incubator-ignite Updated Branches: refs/heads/ignite-709_1 ee94aca15 -> 8eaa7da90
# IGNITE-709 Code cleanup: use Long.compare() Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d3c0518c Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d3c0518c Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d3c0518c Branch: refs/heads/ignite-709_1 Commit: d3c0518c5b6760080e42427a3fcad3d019f08430 Parents: ee94aca Author: sevdokimov <sevdoki...@gridgain.com> Authored: Wed Apr 22 14:49:53 2015 +0300 Committer: sevdokimov <sevdoki...@gridgain.com> Committed: Wed Apr 22 14:49:53 2015 +0300 ---------------------------------------------------------------------- .../ignite/spi/discovery/tcp/TcpDiscoverySpiAdapter.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d3c0518c/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiAdapter.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiAdapter.java index 98e048d..049e4f6 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiAdapter.java @@ -778,14 +778,12 @@ abstract class TcpDiscoverySpiAdapter extends IgniteSpiAdapter implements Discov private final GridConcurrentSkipListSet<SocketTimeoutObject> timeoutObjs = new GridConcurrentSkipListSet<>(new Comparator<SocketTimeoutObject>() { @Override public int compare(SocketTimeoutObject o1, SocketTimeoutObject o2) { - long time1 = o1.endTime(); - long time2 = o2.endTime(); + int res = Long.compare(o1.endTime(), o2.endTime()); - long id1 = o1.id(); - long id2 = o2.id(); + if (res != 0) + return res; - return time1 < time2 ? -1 : time1 > time2 ? 1 : - id1 < id2 ? -1 : id1 > id2 ? 1 : 0; + return Long.compare(o1.id(), o2.id()); } });
