# HG changeset patch
# User iklam
# Date 1513711747 28800
# Node ID 1d24b76cf639dbc7ddb6f5b195b25a5bcd269f1b
# Parent  7312ae4465d6328edb3d2cd43e66ec0c91be48ca
8191374: Improve error message when CDS is not supported on exploded build
Reviewed-by: jiangli, hseigel

diff -r 7312ae4465d6 -r 1d24b76cf639 src/hotspot/share/classfile/classLoader.cpp
--- a/src/hotspot/share/classfile/classLoader.cpp	Mon Dec 04 08:59:47 2017 -0800
+++ b/src/hotspot/share/classfile/classLoader.cpp	Tue Dec 19 11:29:07 2017 -0800
@@ -802,6 +802,14 @@
   int end = 0;
   bool set_base_piece = true;
 
+#if INCLUDE_CDS
+  if (DumpSharedSpaces || UseSharedSpaces) {
+    if (!Arguments::has_jimage()) {
+      vm_exit_during_initialization("CDS is not supported in exploded JDK build", NULL);
+    }
+  }
+#endif
+
   // Iterate over class path entries
   for (int start = 0; start < len; start = end) {
     while (class_path[end] && class_path[end] != os::path_separator()[0]) {