1.1 --- a/src/share/vm/prims/jvmti.xml Fri Sep 06 11:11:19 2013 -0700 1.2 +++ b/src/share/vm/prims/jvmti.xml Wed Sep 11 20:03:34 2013 -0400 1.3 @@ -458,8 +458,10 @@ 1.4 the same name from being loaded dynamically. 1.5 <p/> 1.6 The VM will invoke the Agent_OnUnload_L function of the agent, if such 1.7 - a function is exported, at the same point during startup as it would 1.8 - have called the dynamic entry point Agent_OnUnLoad. 1.9 + a function is exported, at the same point during VM execution as it would 1.10 + have called the dynamic entry point Agent_OnUnLoad. A statically loaded 1.11 + agent cannot be unloaded. The Agent_OnUnload_L function will still be 1.12 + called to do any other agent shutdown related tasks. 1.13 If a <i>statically linked</i> agent L exports a function called 1.14 Agent_OnUnLoad_L and a function called Agent_OnUnLoad, the Agent_OnUnLoad 1.15 function will be ignored.