*** old/src/share/vm/prims/jvmtiEnv.cpp	Fri Jan  8 01:43:04 2016
--- new/src/share/vm/prims/jvmtiEnv.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.

*** 27,36 ****
--- 27,37 ----
  #include "classfile/systemDictionary.hpp"
  #include "classfile/vmSymbols.hpp"
  #include "interpreter/bytecodeStream.hpp"
  #include "interpreter/interpreter.hpp"
  #include "jvmtifiles/jvmtiEnv.hpp"
+ #include "logging/log.hpp"
  #include "logging/logConfiguration.hpp"
  #include "memory/resourceArea.hpp"
  #include "memory/universe.inline.hpp"
  #include "oops/instanceKlass.hpp"
  #include "oops/objArrayOop.inline.hpp"

*** 471,482 ****
--- 472,484 ----
      Handle loader_lock = Handle(thread, SystemDictionary::system_loader_lock());
  
      ObjectLocker ol(loader_lock, thread);
  
      // add the jar file to the bootclasspath
!     if (TraceClassLoading) {
!       tty->print_cr("[Opened %s]", zip_entry->name());
!     if (log_is_enabled(Info, classload)) {
!       outputStream* log = LogHandle(classload)::info_stream();
+       log->print_cr("[Opened %s]", zip_entry->name());
      }
      ClassLoaderExt::append_boot_classpath(zip_entry);
      return JVMTI_ERROR_NONE;
    } else {
      return JVMTI_ERROR_WRONG_PHASE;

*** 623,634 ****
--- 625,641 ----
    switch (flag) {
    case JVMTI_VERBOSE_OTHER:
      // ignore
      break;
    case JVMTI_VERBOSE_CLASS:
      TraceClassLoading = value != 0;
!     TraceClassUnloading = value != 0;
+     if (value == 0) {
!       LogConfiguration::parse_log_arguments("stdout", "classunload=off", NULL, NULL, NULL);
+       LogConfiguration::parse_log_arguments("stdout", "classload=off", NULL, NULL, NULL);
+     } else {
+       LogConfiguration::parse_log_arguments("stdout", "classload=info", NULL, NULL, NULL);
+       LogConfiguration::parse_log_arguments("stdout", "classunload=info", NULL, NULL, NULL);
+     }
      break;
    case JVMTI_VERBOSE_GC:
      if (value == 0) {
        LogConfiguration::parse_log_arguments("stdout", "gc=off", NULL, NULL, NULL);
      } else {