fixed files form Lang #64

program-repair · Mar 7, 2017 · 163957b · 163957b
1 parent a7e8a02
commit 163957b
Showing 1 changed file with 21 additions and 0 deletions.
diff --git a/projects/Lang/64/org/apache/commons/lang/enums/ValuedEnum.java b/projects/Lang/64/org/apache/commons/lang/enums/ValuedEnum.java
@@ -180,6 +180,16 @@ public final int getValue() {
      * @throws NullPointerException if other is <code>null</code>
      */
     public int compareTo(Object other) {
+        if (other == this) {
+            return 0;
+        }
+        if (other.getClass() != this.getClass()) {
+            if (other.getClass().getName().equals(this.getClass().getName())) {
+                return iValue - getValueInOtherClassLoader(other);
+            }
+            throw new ClassCastException(
+                    "Different enum class '" + ClassUtils.getShortClassName(other.getClass()) + "'");
+        }
         return iValue - ((ValuedEnum) other).iValue;
     }
 
@@ -189,9 +199,20 @@ public int compareTo(Object other) {
      * @param other  the object to determine the value for
      * @return the value
      */
+    private int getValueInOtherClassLoader(Object other) {
+        try {
+            Method mth = other.getClass().getMethod("getValue", null);
+            Integer value = (Integer) mth.invoke(other, null);
+            return value.intValue();
+        } catch (NoSuchMethodException e) {
             // ignore - should never happen
+        } catch (IllegalAccessException e) {
             // ignore - should never happen
+        } catch (InvocationTargetException e) {
             // ignore - should never happen
+        }
+        throw new IllegalStateException("This should not happen");
+    }
 
     /**
      * <p>Human readable description of this <code>Enum</code> item.</p>