Index: build.xml
===================================================================
--- build.xml (revision 14857)
+++ build.xml (working copy)
@@ -1086,6 +1086,7 @@
+
Index: rvm/src/org/jikesrvm/runtime/Entrypoints.java
===================================================================
--- rvm/src/org/jikesrvm/runtime/Entrypoints.java (revision 14857)
+++ rvm/src/org/jikesrvm/runtime/Entrypoints.java (working copy)
@@ -422,6 +422,7 @@
public static final RVMField luni3;
public static final RVMField luni4;
public static final RVMField luni5;
+ public static final RVMField luni6;
static {
if (VM.BuildForHarmony) {
@@ -430,12 +431,14 @@
luni3 = getField("Lorg/apache/harmony/luni/internal/nls/Messages;", "bundle", java.util.ResourceBundle.class);
luni4 = getField("Lorg/apache/harmony/nio/internal/nls/Messages;", "bundle", java.util.ResourceBundle.class);
luni5 = getField("Lorg/apache/harmony/niochar/internal/nls/Messages;", "bundle", java.util.ResourceBundle.class);
+ luni6 = getField(java.util.logging.LogManager.class, "manager", java.util.logging.LogManager.class);
} else {
luni1 = null;
luni2 = null;
luni3 = null;
luni4 = null;
luni5 = null;
+ luni6 = null;
}
}
}
Index: rvm/src/org/jikesrvm/VM.java
===================================================================
--- rvm/src/org/jikesrvm/VM.java (revision 14857)
+++ rvm/src/org/jikesrvm/VM.java (working copy)
@@ -420,12 +420,14 @@
Entrypoints.luni3.setObjectValueUnchecked(null, null);
Entrypoints.luni4.setObjectValueUnchecked(null, null);
Entrypoints.luni5.setObjectValueUnchecked(null, null);
+ Entrypoints.luni6.setObjectValueUnchecked(null, null);
//runClassInitializer("java.lang.String$ConsolePrintStream");
runClassInitializer("org.apache.harmony.luni.util.Msg");
runClassInitializer("org.apache.harmony.archive.internal.nls.Messages");
runClassInitializer("org.apache.harmony.luni.internal.nls.Messages");
runClassInitializer("org.apache.harmony.nio.internal.nls.Messages");
runClassInitializer("org.apache.harmony.niochar.internal.nls.Messages");
+ runClassInitializer("java.util.logging.LogManager");
}
// Initialize compiler that compiles dynamically loaded classes.