Merge pull request jenkinsci#4237 from StefanSpieker/negating_result_…

…compareto Spotbugs: changed order for compare instead of negating result
timeticktick · Oct 2, 2019 · 9ba288f · 9ba288f
2 parents 5f4b878 + d408627
commit 9ba288f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/core/src/main/java/hudson/Functions.java b/core/src/main/java/hudson/Functions.java
@@ -1059,8 +1059,8 @@ private StringBuilder buildSuperclassHierarchy(Class c, StringBuilder buf) {
         }
 
         public int compareTo(Tag that) {
-            int r = Double.compare(this.ordinal, that.ordinal);
-            if (r!=0)   return -r; // descending for ordinal
+            int r = Double.compare(that.ordinal, this.ordinal);
+            if (r!=0)   return r; // descending for ordinal by reversing the order for compare
             return this.hierarchy.compareTo(that.hierarchy);
         }
     }

diff --git a/core/src/main/java/hudson/model/RunMap.java b/core/src/main/java/hudson/model/RunMap.java
@@ -156,7 +156,7 @@ public R oldestValue() {
     @Deprecated
     public static final Comparator<Comparable> COMPARATOR = new Comparator<Comparable>() {
         public int compare(Comparable o1, Comparable o2) {
-            return -o1.compareTo(o2);
+            return o2.compareTo(o1);
         }
     };