From adafe09d0ff2b82f8967bc85179bc72e758aef42 Mon Sep 17 00:00:00 2001
From: Ian Rogers <ian.rogers@manchester.ac.uk>
Date: Fri, 17 Apr 2009 23:56:24 +0100
Subject: [PATCH] Harmony 5.0M9 fixes.

---
 build/primordials/Harmony.txt                               | 6 ++++++
 .../org/jikesrvm/tools/bootImageWriter/BootImageWriter.java | 5 +++++
 2 files changed, 11 insertions(+)

diff --git a/build/primordials/Harmony.txt b/build/primordials/Harmony.txt
index 1c6db5a32..c507e70af 100755
--- 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
index e6f4207bd..ad629186a 100644
--- 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]);