From: Bryan Duxbury <bryanduxbury@apache.org>
Date: Tue, 2 Aug 2011 22:37:16 +0000 (+0000)
Subject: THRIFT-1255. javame: Mismatch of method name between JavaME's lib and generated code... 
X-Git-Tag: 0.7.0~15
X-Git-Url: https://source.supwisdom.com/gerrit/gitweb?a=commitdiff_plain;h=4e0192f660bfd83921842a9e59d04c681100156a;p=common%2Fthrift.git

THRIFT-1255. javame: Mismatch of method name between JavaME's lib and generated code (compareTo/compareObjects)

Patch: Raphael Bartement

git-svn-id: https://svn.apache.org/repos/asf/thrift/trunk@1153295 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/lib/javame/src/org/apache/thrift/TBaseHelper.java b/lib/javame/src/org/apache/thrift/TBaseHelper.java
index 5ec89920..2f31d311 100644
--- a/lib/javame/src/org/apache/thrift/TBaseHelper.java
+++ b/lib/javame/src/org/apache/thrift/TBaseHelper.java
@@ -112,7 +112,7 @@ public class TBaseHelper {
         return 0;
     }
 
-    public static int compareObjects(Object a, Object b) {
+    public static int compareTo(Object a, Object b) {
         if (a instanceof Vector) {
             return compareTo((Vector)a, (Vector)b);
         } if (a instanceof Hashtable) {
@@ -130,7 +130,7 @@ public class TBaseHelper {
         for (int i = 0; i < a.size(); i++) {
             Object oA = a.elementAt(i);
             Object oB = b.elementAt(i);
-            lastComparison = compareObjects(oA, oB);
+            lastComparison = compareTo(oA, oB);
             if (lastComparison != 0) {
                 return lastComparison;
             }
@@ -149,9 +149,9 @@ public class TBaseHelper {
         while (lastComparison == 0 && enumA.hasMoreElements()) {
             Object keyA = enumA.nextElement();
             Object keyB = enumB.nextElement();
-            lastComparison = compareObjects(keyA, keyB);
+            lastComparison = compareTo(keyA, keyB);
             if (lastComparison == 0) {
-                lastComparison = compareObjects(a.get(keyA), b.get(keyB));
+                lastComparison = compareTo(a.get(keyA), b.get(keyB));
             }
         }
         return lastComparison;