*** old/src/share/vm/memory/filemap.cpp	Fri Jan  8 01:43:04 2016
--- new/src/share/vm/memory/filemap.cpp	Fri Jan  8 01:43:04 2016

*** 1,7 ****
--- 1,7 ----
  /*
!  * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
!  * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.

*** 206,218 ****
--- 206,221 ----
  
        if (pass == 0) {
          count ++;
          bytes += (int)entry_size;
          bytes += name_bytes;
-         if (TraceClassPaths || (TraceClassLoading && Verbose)) {
            tty->print_cr("[Add main shared path (%s) %s]", (cpe->is_jar_file() ? "jar" : "dir"), name);
          }
+         if (log_is_enabled(Debug, classload)) {
+           log_debug(classload)("[Add main shared path (%s) %s]", (cpe->is_jar_file() ? "jar" : "dir"), name);
+         }
        } else {
          SharedClassPathEntry* ent = shared_classpath(cur_entry);
          if (cpe->is_jar_file()) {
            struct stat st;
            if (os::stat(name, &st) != 0) {

*** 273,285 ****
--- 276,291 ----
    for (int i=0; i<count; i++) {
      SharedClassPathEntry* ent = shared_classpath(i);
      struct stat st;
      const char* name = ent->_name;
      bool ok = true;
-     if (TraceClassPaths || (TraceClassLoading && Verbose)) {
        tty->print_cr("[Checking shared classpath entry: %s]", name);
      }
+     if (log_is_enabled(Debug, classload)) {
+       log_debug(classload)("[Checking shared classpath entry: %s]", name);
+     }
      if (os::stat(name, &st) != 0) {
        fail_continue("Required classpath entry does not exist: %s", name);
        ok = false;
      } else if (ent->is_dir()) {
        if (!os::dir_is_empty(name)) {

*** 299,311 ****
--- 305,320 ----
                          " the shared archive file: %s", name);
          }
        }
      }
      if (ok) {
-       if (TraceClassPaths || (TraceClassLoading && Verbose)) {
          tty->print_cr("[ok]");
        }
+       if (log_is_enabled(Debug, classload)) {
+         log_debug(classload)("[ok]");
+       }
      } else if (!PrintSharedArchiveAndExit) {
        _validating_classpath_entry_table = false;
        return false;
      }
    }