--- old/src/share/vm/classfile/sharedPathsMiscInfo.cpp	2016-02-19 14:39:20.415370179 -0500
+++ new/src/share/vm/classfile/sharedPathsMiscInfo.cpp	2016-02-19 14:39:20.295175924 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 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
@@ -26,14 +26,18 @@
 #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 (TraceClassPaths) {
-    tty->print("[type=%s] ", type_name(type));
-    trace_class_path("[Add misc shared path ", path);
+  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("add misc shared path ", path);
   }
   write(path, strlen(path) + 1);
   write_jint(jint(type));
@@ -67,7 +71,7 @@
 }
 
 bool SharedPathsMiscInfo::fail(const char* msg, const char* name) {
-  ClassLoader::trace_class_path(tty, msg, name);
+  ClassLoader::trace_class_path(msg, name);
   MetaspaceShared::set_archive_loading_failed();
   return false;
 }
@@ -90,17 +94,18 @@
     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 (log_is_enabled(Info, classpath)) {
+      ResourceMark rm;
+      outputStream* log = LogHandle(classpath)::info_stream();
+      log->print("type=%s ", type_name(type));
+      print_path(type, path);
     }
     if (!check(type, path)) {
       if (!PrintSharedArchiveAndExit) {
         return false;
       }
     } else {
-      trace_class_path("[ok");
+      ClassLoader::trace_class_path("ok");
     }
   }