--- old/src/share/vm/memory/filemap.cpp	2016-01-08 01:43:04.922467332 -0500
+++ new/src/share/vm/memory/filemap.cpp	2016-01-08 01:43:04.666214663 -0500
@@ -1,5 +1,5 @@
 /*
- * 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
@@ -208,9 +208,12 @@
         count ++;
         bytes += (int)entry_size;
         bytes += name_bytes;
-        if (TraceClassPaths || (TraceClassLoading && Verbose)) {
+        if (TraceClassPaths) {
           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()) {
@@ -275,9 +278,12 @@
     struct stat st;
     const char* name = ent->_name;
     bool ok = true;
-    if (TraceClassPaths || (TraceClassLoading && Verbose)) {
+    if (TraceClassPaths) {
       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;
@@ -301,9 +307,12 @@
       }
     }
     if (ok) {
-      if (TraceClassPaths || (TraceClassLoading && Verbose)) {
+      if (TraceClassPaths) {
         tty->print_cr("[ok]");
       }
+      if (log_is_enabled(Debug, classload)) {
+        log_debug(classload)("[ok]");
+      }
     } else if (!PrintSharedArchiveAndExit) {
       _validating_classpath_entry_table = false;
       return false;