*** old/src/share/vm/services/classLoadingService.cpp	Sat Jun 13 09:00:32 2015
--- new/src/share/vm/services/classLoadingService.cpp	Sat Jun 13 09:00:32 2015

*** 1,7 ****
--- 1,7 ----
  /*
!  * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
!  * Copyright (c) 2003, 2015, 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.

*** 30,39 ****
--- 30,40 ----
  #include "runtime/mutexLocker.hpp"
  #include "services/classLoadingService.hpp"
  #include "services/memoryService.hpp"
  #include "utilities/dtrace.hpp"
  #include "utilities/macros.hpp"
+ #include "utilities/defaultStream.hpp"
  
  #ifdef DTRACE_ENABLED
  
  // Only bother with this argument setup if dtrace is available
  

*** 174,201 ****
--- 175,201 ----
      //class_size += k->fields()->size();
    }
    return class_size * oopSize;
  }
  
  
  bool ClassLoadingService::set_verbose(bool verbose) {
    MutexLocker m(Management_lock);
  
    // verbose will be set to the previous value
!   bool succeed = CommandLineFlags::boolAtPut((char*)"TraceClassLoading", &verbose, Flag::MANAGEMENT);
!   assert(succeed, "Setting TraceClassLoading flag fails");
!   Flag::Error error = CommandLineFlags::boolAtPut("TraceClassLoading", &verbose, Flag::MANAGEMENT);
!   assert(error==Flag::SUCCESS, err_msg("Setting TraceClassLoading flag failed with error %s", Flag::flag_error_str(error)));
    reset_trace_class_unloading();
  
    return verbose;
  }
  
  // Caller to this function must own Management_lock
  void ClassLoadingService::reset_trace_class_unloading() {
    assert(Management_lock->owned_by_self(), "Must own the Management_lock");
    bool value = MemoryService::get_verbose() || ClassLoadingService::get_verbose();
!   bool succeed = CommandLineFlags::boolAtPut((char*)"TraceClassUnloading", &value, Flag::MANAGEMENT);
!   assert(succeed, "Setting TraceClassUnLoading flag fails");
!   Flag::Error error = CommandLineFlags::boolAtPut("TraceClassUnloading", &value, Flag::MANAGEMENT);
!   assert(error==Flag::SUCCESS, err_msg("Setting TraceClassUnLoading flag failed with error %s", Flag::flag_error_str(error)));
  }
  
  GrowableArray<KlassHandle>* LoadedClassesEnumerator::_loaded_classes = NULL;
  Thread* LoadedClassesEnumerator::_current_thread = NULL;