--- old/src/share/vm/prims/jvmtiExport.cpp	2016-09-12 12:56:28.434486800 -0400
+++ new/src/share/vm/prims/jvmtiExport.cpp	2016-09-12 12:56:28.079007700 -0400
@@ -2407,7 +2407,9 @@
         delete agent_lib;
       }
 
+      // Agent_OnAttach executed so completion status is JNI_OK
       st->print_cr("%d", result);
+      result = JNI_OK;
     }
   }
   return result;
--- old/src/share/vm/services/diagnosticCommand.cpp	2016-09-12 12:56:30.727367500 -0400
+++ new/src/share/vm/services/diagnosticCommand.cpp	2016-09-12 12:56:30.367257800 -0400
@@ -277,12 +277,11 @@
 
   char *suffix = strrchr(_libpath.value(), '.');
   bool is_java_agent = (suffix != NULL) && (strncmp(".jar", suffix, 4) == 0);
-  jint result = JNI_ERR;
 
   if (is_java_agent) {
     if (_option.value() == NULL) {
-      result = JvmtiExport::load_agent_library("instrument", "false",
-                                                _libpath.value(), output());
+      JvmtiExport::load_agent_library("instrument", "false",
+                                      _libpath.value(), output());
     } else {
       size_t opt_len = strlen(_libpath.value()) + strlen(_option.value()) + 2;
       if (opt_len > 4096) {
@@ -299,18 +298,14 @@
       }
 
       jio_snprintf(opt, opt_len, "%s=%s", _libpath.value(), _option.value());
-      result = JvmtiExport::load_agent_library("instrument", "false",
-                                                opt, output());
+      JvmtiExport::load_agent_library("instrument", "false", opt, output());
 
       os::free(opt);
     }
   } else {
-    result = JvmtiExport::load_agent_library(_libpath.value(), "true",
-                                             _option.value(), output());
+    JvmtiExport::load_agent_library(_libpath.value(), "true",
+                                    _option.value(), output());
   }
-
-  output()->print_cr("JVMTI agent attach %s.",
-                                  (result == JNI_OK) ? "succeeded" : "failed");
 }
 
 int JVMTIAgentLoadDCmd::num_arguments() {