svn commit: r617198 - in /openjpa/trunk: openjpa-kernel/src/main/java/org/apache/openjpa/meta/ openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/meta/

[pcl]

Author: pcl
Date: Thu Jan 31 11:39:25 2008
New Revision: 617198

URL: http://svn.apache.org/viewvc?rev=617198&view=rev
Log:
OPENJPA-258 Merge from ../branches/1.0.x. svn merge -c 617039

Added:
    
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/meta/
      - copied from r617039, 
openjpa/branches/1.0.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/meta/
    
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/meta/A.java
      - copied unchanged from r617039, 
openjpa/branches/1.0.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/meta/A.java
    
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/meta/AbstractThing.java
      - copied unchanged from r617039, 
openjpa/branches/1.0.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/meta/AbstractThing.java
    
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/meta/B.java
      - copied unchanged from r617039, 
openjpa/branches/1.0.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/meta/B.java
    
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/meta/C.java
      - copied unchanged from r617039, 
openjpa/branches/1.0.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/meta/C.java
    
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/meta/TestMetaDataInheritanceComparator.java
      - copied unchanged from r617039, 
openjpa/branches/1.0.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/meta/TestMetaDataInheritanceComparator.java
Modified:
    
openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/InheritanceComparator.java

Modified: 
openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/InheritanceComparator.java
URL: 
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/InheritanceComparator.java?rev=617198&r1=617197&r2=617198&view=diff
==============================================================================
--- 
openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/InheritanceComparator.java
 (original)
+++ 
openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/InheritanceComparator.java
 Thu Jan 31 11:39:25 2008
@@ -75,7 +75,13 @@
                 return 1;
             return c1.getName().compareTo(c2.getName());
         }
-        return i1 - i2;
+        int diff = i1 - i2;
+        if (diff < 0)
+            return -1;
+        else if (diff > 0)
+            return 1;
+        else
+            return 0;
     }
 
     /**