You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@skywalking.apache.org by wu...@apache.org on 2018/04/28 03:07:53 UTC
[incubator-skywalking] branch master updated: Fix #1127 Comparison
method violates its general contract (#1129)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
The following commit(s) were added to refs/heads/master by this push:
new 268ea2f Fix #1127 Comparison method violates its general contract (#1129)
268ea2f is described below
commit 268ea2f0d0317325aa05ab8e8de1533aeb32714d
Author: Gao Hongtao <ha...@gmail.com>
AuthorDate: Fri Apr 27 22:07:49 2018 -0500
Fix #1127 Comparison method violates its general contract (#1129)
---
.../apm/collector/storage/es/dao/ui/ApplicationMetricEsUIDAO.java | 2 +-
.../apm/collector/storage/es/dao/ui/InstanceMetricEsUIDAO.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/ui/ApplicationMetricEsUIDAO.java b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/ui/ApplicationMetricEsUIDAO.java
index ced6850..0fc5d87 100644
--- a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/ui/ApplicationMetricEsUIDAO.java
+++ b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/ui/ApplicationMetricEsUIDAO.java
@@ -78,7 +78,7 @@ public class ApplicationMetricEsUIDAO extends EsDAO implements IApplicationMetri
applicationThroughputList.add(applicationThroughput);
});
- applicationThroughputList.sort((first, second) -> first.getCpm() > second.getCpm() ? -1 : 1);
+ applicationThroughputList.sort((first, second) -> Integer.compare(second.getCpm(), first.getCpm()));
if (applicationThroughputList.size() <= topN) {
return applicationThroughputList;
diff --git a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/ui/InstanceMetricEsUIDAO.java b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/ui/InstanceMetricEsUIDAO.java
index 8982ba6..7cee039 100644
--- a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/ui/InstanceMetricEsUIDAO.java
+++ b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/ui/InstanceMetricEsUIDAO.java
@@ -84,7 +84,7 @@ public class InstanceMetricEsUIDAO extends EsDAO implements IInstanceMetricUIDAO
appServerInfoList.add(appServerInfo);
});
- appServerInfoList.sort((first, second) -> first.getCpm() > second.getCpm() ? -1 : 1);
+ appServerInfoList.sort((first, second) -> Integer.compare(second.getCpm(), first.getCpm()));
if (appServerInfoList.size() <= topN) {
return appServerInfoList;
} else {
--
To stop receiving notification emails like this one, please contact
wusheng@apache.org.