--- a/hotspot/src/share/vm/prims/jvmtiExport.cpp	Mon Sep 12 16:34:36 2016 +0200
+++ b/hotspot/src/share/vm/prims/jvmtiExport.cpp	Mon Sep 12 13:16:39 2016 -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;