src/share/vm/classfile/sharedPathsMiscInfo.cpp

*** 24,41 ****
  
  #include "precompiled.hpp"
  #include "classfile/classLoader.hpp"
  #include "classfile/classLoaderData.inline.hpp"
  #include "classfile/sharedPathsMiscInfo.hpp"
  #include "memory/allocation.inline.hpp"
  #include "memory/metaspaceShared.hpp"
  #include "runtime/arguments.hpp"
  
  void SharedPathsMiscInfo::add_path(const char* path, int type) {
!   if (TraceClassPaths) {
!     tty->print("[type=%s] ", type_name(type));
!     trace_class_path("[Add misc shared path ", path);
    }
    write(path, strlen(path) + 1);
    write_jint(jint(type));
  }
  
--- 24,45 ----
  
  #include "precompiled.hpp"
  #include "classfile/classLoader.hpp"
  #include "classfile/classLoaderData.inline.hpp"
  #include "classfile/sharedPathsMiscInfo.hpp"
+ #include "logging/log.hpp"
  #include "memory/allocation.inline.hpp"
  #include "memory/metaspaceShared.hpp"
  #include "runtime/arguments.hpp"
+ #include "utilities/ostream.hpp"
  
  void SharedPathsMiscInfo::add_path(const char* path, int type) {
!   if (log_is_enabled(Info, classpath)) {
!     ResourceMark rm;
!     outputStream* log = LogHandle(classpath)::info_stream();
!     log->print("type=%s ", type_name(type));
!     ClassLoader::trace_class_path(log, "add misc shared path ", path);
    }
    write(path, strlen(path) + 1);
    write_jint(jint(type));
  }
  
*** 88,108 ****
      const char* path = _cur_ptr;
      _cur_ptr += strlen(path) + 1;
      if (!read_jint(&type)) {
        return fail("Corrupted archive file header");
      }
!     if (TraceClassPaths) {
!       tty->print("[type=%s ", type_name(type));
!       print_path(tty, type, path);
!       tty->print_cr("]");
      }
      if (!check(type, path)) {
        if (!PrintSharedArchiveAndExit) {
          return false;
        }
      } else {
!       trace_class_path("[ok");
      }
    }
  
    return true;
  }
--- 92,113 ----
      const char* path = _cur_ptr;
      _cur_ptr += strlen(path) + 1;
      if (!read_jint(&type)) {
        return fail("Corrupted archive file header");
      }
!     if (log_is_enabled(Info, classpath)) {
!       ResourceMark rm;
!       outputStream* log = LogHandle(classpath)::info_stream();
!       log->print("type=%s ", type_name(type));
!       print_path(log, type, path);
      }
      if (!check(type, path)) {
        if (!PrintSharedArchiveAndExit) {
          return false;
        }
      } else {
!       trace_class_path("[ok]");
      }
    }
  
    return true;
  }