src/share/vm/classfile/classLoader.cpp

*** 35,44 ****
--- 35,45 ----
  #include "compiler/compileBroker.hpp"
  #include "gc/shared/collectedHeap.inline.hpp"
  #include "gc/shared/generation.hpp"
  #include "interpreter/bytecodeStream.hpp"
  #include "interpreter/oopMapCache.hpp"
+ #include "logging/logTag.hpp"
  #include "memory/allocation.inline.hpp"
  #include "memory/filemap.hpp"
  #include "memory/oopFactory.hpp"
  #include "memory/universe.inline.hpp"
  #include "oops/instanceKlass.hpp"
*** 415,434 ****
  #endif
  
  #if INCLUDE_CDS
  void ClassLoader::exit_with_path_failure(const char* error, const char* message) {
    assert(DumpSharedSpaces, "only called at dump time");
!   tty->print_cr("Hint: enable -XX:+TraceClassPaths to diagnose the failure");
    vm_exit_during_initialization(error, message);
  }
  #endif
  
! void ClassLoader::trace_class_path(outputStream* out, const char* msg, const char* name) {
!   if (!TraceClassPaths) {
!     return;
!   }
! 
    if (msg) {
      out->print("%s", msg);
    }
    if (name) {
      if (strlen(name) < 256) {
--- 416,434 ----
  #endif
  
  #if INCLUDE_CDS
  void ClassLoader::exit_with_path_failure(const char* error, const char* message) {
    assert(DumpSharedSpaces, "only called at dump time");
!   tty->print_cr("Hint: enable -Xlog:classpath=info to diagnose the failure");
    vm_exit_during_initialization(error, message);
  }
  #endif
  
! void ClassLoader::trace_class_path(const char* msg, const char* name) {
!   if (log_is_enabled(Info, classpath)) {
!     ResourceMark rm;
!     outputStream* out = LogHandle(classpath)::info_stream();
      if (msg) {
        out->print("%s", msg);
      }
      if (name) {
        if (strlen(name) < 256) {
*** 440,452 ****
          out->print("%c", name[0]);
          name++;
        }
      }
    }
-   if (msg && msg[0] == '[') {
-     out->print_cr("]");
-   } else {
      out->cr();
    }
  }
  
  #if INCLUDE_CDS
--- 440,449 ----
*** 468,482 ****
  #endif
  
  void ClassLoader::setup_bootstrap_search_path() {
    assert(_first_entry == NULL, "should not setup bootstrap class search path twice");
    const char* sys_class_path = Arguments::get_sysclasspath();
    if (PrintSharedArchiveAndExit) {
      // Don't print sys_class_path - this is the bootcp of this current VM process, not necessarily
      // the same as the bootcp of the shared archive.
    } else {
!     trace_class_path(tty, "[Bootstrap loader class path=", sys_class_path);
    }
  #if INCLUDE_CDS
    if (DumpSharedSpaces) {
      _shared_paths_misc_info->add_boot_classpath(sys_class_path);
    }
--- 465,481 ----
  #endif
  
  void ClassLoader::setup_bootstrap_search_path() {
    assert(_first_entry == NULL, "should not setup bootstrap class search path twice");
    const char* sys_class_path = Arguments::get_sysclasspath();
+   const char* java_class_path = Arguments::get_appclasspath();
    if (PrintSharedArchiveAndExit) {
      // Don't print sys_class_path - this is the bootcp of this current VM process, not necessarily
      // the same as the bootcp of the shared archive.
    } else {
!     trace_class_path("bootstrap loader class path=", sys_class_path);
!     trace_class_path("classpath: ", java_class_path);
    }
  #if INCLUDE_CDS
    if (DumpSharedSpaces) {
      _shared_paths_misc_info->add_boot_classpath(sys_class_path);
    }
*** 576,588 ****
          } else {
            return NULL;
          }
        }
      }
!     if (TraceClassPaths) {
!       tty->print_cr("[Opened %s]", path);
!     }
      log_info(classload)("opened: %s", path);
    } else {
      // Directory
      new_entry = new ClassPathDirEntry(path);
      log_info(classload)("path: %s", path);
--- 575,585 ----
          } else {
            return NULL;
          }
        }
      }
!     log_info(classpath)("opened: %s", path);
      log_info(classload)("opened: %s", path);
    } else {
      // Directory
      new_entry = new ClassPathDirEntry(path);
      log_info(classload)("path: %s", path);