[commons-jcs] branch master updated: JCS-214 - Use 'compare()' method to compare numbers

[tv]

This is an automated email from the ASF dual-hosted git repository.

tv pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-jcs.git


The following commit(s) were added to refs/heads/master by this push:
     new 150688a  JCS-214 - Use 'compare()' method to compare numbers
     new 017f384  Merge pull request #38 from arturobernalg/feature/JCS-214
150688a is described below

commit 150688af5959c994ee471b437789e02fe0044e12
Author: Arturo Bernal <arturobern...@gmail.com>
AuthorDate: Sun Mar 28 17:10:14 2021 +0200

    JCS-214 - Use 'compare()' method to compare numbers
---
 .../commons/jcs3/auxiliary/disk/indexed/IndexedDiskCache.java  | 10 +---------
 .../auxiliary/disk/indexed/IndexedDiskElementDescriptor.java   | 10 +---------
 2 files changed, 2 insertions(+), 18 deletions(-)

diff --git 
a/commons-jcs-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/indexed/IndexedDiskCache.java
 
b/commons-jcs-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/indexed/IndexedDiskCache.java
index 4259df4..b795683 100644
--- 
a/commons-jcs-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/indexed/IndexedDiskCache.java
+++ 
b/commons-jcs-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/indexed/IndexedDiskCache.java
@@ -1499,15 +1499,7 @@ public class IndexedDiskCache<K, V> extends 
AbstractDiskCache<K, V>
         @Override
         public int compare(final IndexedDiskElementDescriptor ded1, final 
IndexedDiskElementDescriptor ded2)
         {
-            if (ded1.pos < ded2.pos)
-            {
-                return -1;
-            }
-            if (ded1.pos == ded2.pos)
-            {
-                return 0;
-            }
-            return 1;
+            return Long.compare(ded1.pos, ded2.pos);
         }
     }
 
diff --git 
a/commons-jcs-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/indexed/IndexedDiskElementDescriptor.java
 
b/commons-jcs-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/indexed/IndexedDiskElementDescriptor.java
index 1a289cd..a889574 100644
--- 
a/commons-jcs-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/indexed/IndexedDiskElementDescriptor.java
+++ 
b/commons-jcs-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/indexed/IndexedDiskElementDescriptor.java
@@ -107,15 +107,7 @@ public class IndexedDiskElementDescriptor
 
         if ( o.len == len )
         {
-               if ( o.pos == pos )
-               {
-                       return 0;
-               }
-            if ( o.pos < pos )
-               {
-                       return -1;
-               }
-            return 1;
+            return Long.compare(o.pos, pos);
         }
         if ( o.len > len )
         {