svn commit: r1662860 - /pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSObjectKey.java

[tilman]

Author: tilman
Date: Sat Feb 28 00:08:02 2015
New Revision: 1662860

URL: http://svn.apache.org/r1662860
Log:
PDFBOX-2576: revert last commit because it needed JDK7

Modified:
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSObjectKey.java

Modified: 
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSObjectKey.java
URL: 
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSObjectKey.java?rev=1662860&r1=1662859&r2=1662860&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSObjectKey.java 
(original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSObjectKey.java 
Sat Feb 28 00:08:02 2015
@@ -119,12 +119,29 @@ public class COSObjectKey implements Com
     @Override
     public int compareTo(COSObjectKey other)
     {
-        int compareNumber = Long.compare(getNumber(), other.getNumber());
-        if (compareNumber == 0)
+        if (getNumber() < other.getNumber())
         {
-            return Long.compare(getGeneration(), other.getGeneration());
+            return -1;
+        }
+        else if (getNumber() > other.getNumber())
+        {
+            return 1;
+        }
+        else
+        {
+            if (getGeneration() < other.getGeneration())
+            {
+                return -1;
+            }
+            else if (getGeneration() > other.getGeneration())
+            {
+                return 1;
+            }
+            else
+            {
+                return 0;
+            }
         }
-        return compareNumber;
     }
 
 }