# HG changeset patch
# User never
# Date 1240264083 25200
# Node ID 928912ce843879751fb77deddba8e44a5ce739df
# Parent  981375ca07b7f0605f92f57aad95122e8c385a4d# Parent  2bf529ef0adb95e5437ff847e70080ef580373eb
Merge

diff -r 2bf529ef0adb -r 928912ce8438 make/jprt.config
--- a/make/jprt.config	Fri Apr 17 09:38:32 2009 -0700
+++ b/make/jprt.config	Mon Apr 20 14:48:03 2009 -0700
@@ -73,6 +73,7 @@
     else
         if [ "${JPRT_JOB_PRODUCT_RELEASE}" = "jdk6"      -o \
              "${JPRT_JOB_PRODUCT_RELEASE}" = "jdk6u10"   -o \
+             "${JPRT_JOB_PRODUCT_RELEASE}" = "jdk6u14"   -o \
              "${JPRT_JOB_PRODUCT_RELEASE}" = "jdk6perf" ] ; then
             # All jdk6 builds use SS11
             compiler_name=SS11
diff -r 2bf529ef0adb -r 928912ce8438 src/share/vm/memory/dump.cpp
--- a/src/share/vm/memory/dump.cpp	Fri Apr 17 09:38:32 2009 -0700
+++ b/src/share/vm/memory/dump.cpp	Mon Apr 20 14:48:03 2009 -0700
@@ -929,7 +929,8 @@
     guarantee(SystemDictionary::constraints()->number_of_entries() == 0,
               "loader constraints are not saved");
     // Revisit and implement this if we prelink method handle call sites:
-    guarantee(SystemDictionary::invoke_method_table()->number_of_entries() == 0,
+    guarantee(SystemDictionary::invoke_method_table() == NULL ||
+              SystemDictionary::invoke_method_table()->number_of_entries() == 0,
               "invoke method table is not saved");
     GenCollectedHeap* gch = GenCollectedHeap::heap();