*** old/src/share/vm/services/management.cpp	Wed May 27 10:37:47 2015
--- new/src/share/vm/services/management.cpp	Wed May 27 10:37:47 2015

*** 1695,1715 ****
--- 1695,1715 ----
    char* name = java_lang_String::as_utf8_string(fn);
  
    FormatBuffer<80> err_msg("%s", "");
    int succeed = WriteableFlags::set_flag(name, new_value, Flag::MANAGEMENT, err_msg);
  
!   if (succeed != WriteableFlags::SUCCESS) {
!     if (succeed == WriteableFlags::MISSING_VALUE) {
!     if (succeed == Flag::MISSING_VALUE) {
        // missing value causes NPE to be thrown
        THROW(vmSymbols::java_lang_NullPointerException());
      } else {
        // all the other errors are reported as IAE with the appropriate error message
        THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(),
                  err_msg.buffer());
      }
    }
!   assert(succeed == WriteableFlags::SUCCESS, "Setting flag should succeed");
  JVM_END
  
  class ThreadTimesClosure: public ThreadClosure {
   private:
    objArrayHandle _names_strings;