src/hotspot/share/classfile/classLoader.cpp

*** 137,146 ****
--- 137,147 ----
  GrowableArray<ModuleClassPathList*>* ClassLoader::_patch_mod_entries = NULL;
  GrowableArray<ModuleClassPathList*>* ClassLoader::_exploded_entries = NULL;
  ClassPathEntry* ClassLoader::_jrt_entry = NULL;
  ClassPathEntry* ClassLoader::_first_append_entry = NULL;
  ClassPathEntry* ClassLoader::_last_append_entry  = NULL;
+ const char*     ClassLoader::_modules_image_identity = MODULES_IMAGE_NAME;
  #if INCLUDE_CDS
  ClassPathEntry* ClassLoader::_app_classpath_entries = NULL;
  ClassPathEntry* ClassLoader::_last_app_classpath_entry = NULL;
  ClassPathEntry* ClassLoader::_module_path_entries = NULL;
  ClassPathEntry* ClassLoader::_last_module_path_entry = NULL;
*** 734,743 ****
--- 735,746 ----
          // Directory found
          ClassPathEntry* new_entry = create_class_path_entry(path, &st, false, false, CHECK);
  
          // Check for a jimage
          if (Arguments::has_jimage()) {
+           _modules_image_identity = os::strdup(new_entry->name());
+ 
            assert(_jrt_entry == NULL, "should not setup bootstrap class search path twice");
            assert(new_entry != NULL && new_entry->is_modules_image(), "No java runtime image present");
            _jrt_entry = new_entry;
            assert(_jrt_entry->jimage() != NULL, "No java runtime image");
          }
*** 844,854 ****
          } else {
            return NULL;
          }
        }
      }
!     log_info(class, path)("opened: %s", path);
      log_info(class, load)("opened: %s", path);
    } else {
      // Directory
      new_entry = new ClassPathDirEntry(path);
      log_info(class, load)("path: %s", path);
--- 847,857 ----
          } else {
            return NULL;
          }
        }
      }
!     log_info(class, path)("opened: %s (real path: %s)", path, canonical_path);
      log_info(class, load)("opened: %s", path);
    } else {
      // Directory
      new_entry = new ClassPathDirEntry(path);
      log_info(class, load)("path: %s", path);