Harmony 5.0M9 fixes.

codehaus · Apr 17, 2009 · adafe09 · adafe09
1 parent d2911f2
commit adafe09
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/build/primordials/Harmony.txt b/build/primordials/Harmony.txt
@@ -200,9 +200,15 @@ Ljava/util/Hashtable$2;
 Ljava/util/Hashtable$3;
 Ljava/util/Hashtable$4$1;
 Ljava/util/Hashtable$4;
+Ljava/util/Hashtable$5;
+Ljava/util/Hashtable$6$1;
+Ljava/util/Hashtable$6;
+Ljava/util/Hashtable$7$1;
+Ljava/util/Hashtable$7;
 Ljava/util/Hashtable$Entry;
 [Ljava/util/Hashtable$Entry;
 Ljava/util/Hashtable$HashIterator;
+Ljava/util/Hashtable$HashEnumIterator;
 
 Ljava/util/List;
 Ljava/util/ListResourceBundle;

diff --git a/tools/bootImageWriter/src/org/jikesrvm/tools/bootImageWriter/BootImageWriter.java b/tools/bootImageWriter/src/org/jikesrvm/tools/bootImageWriter/BootImageWriter.java
@@ -2356,6 +2356,11 @@ private static boolean copyKnownClasspathStaticField(Class<?> jdkType, String rv
                  rvmFieldName.equals("CACHE") && rvmFieldType.isArrayType()) {
         Statics.setSlotContents(rvmFieldOffset, new Byte[256]);
         return true;
+      } else if (jdkType.equals(java.lang.Integer.class) &&
+                 rvmFieldName.equals("decimalScale") && rvmFieldType.isArrayType()) {
+        Statics.setSlotContents(rvmFieldOffset, new int[] { 1000000000, 100000000,
+            10000000, 1000000, 100000, 10000, 1000, 100, 10, 1 });
+        return true;
       } else if (jdkType.equals(java.lang.Throwable.class) &&
                  rvmFieldName.equals("zeroLengthStackTrace") && rvmFieldType.isArrayType()) {
         Statics.setSlotContents(rvmFieldOffset, new StackTraceElement[0]);