summaryrefslogtreecommitdiffstats
path: root/loadtime5
diff options
context:
space:
mode:
authormwebster <mwebster>2006-08-01 20:41:52 +0000
committermwebster <mwebster>2006-08-01 20:41:52 +0000
commitbebb3640698bf2c465b64d9565123ec699dac45d (patch)
tree01f62d8a964a8125b31a85c6c84b43a3cdc130ee /loadtime5
parenta89eac7f94cbea34f2ca76e49a1c42a594194080 (diff)
downloadaspectj-bebb3640698bf2c465b64d9565123ec699dac45d.tar.gz
aspectj-bebb3640698bf2c465b64d9565123ec699dac45d.zip
Bug 151938 "Handle Duplicate -javaagent entries more gracefully" (ignore duplicate agents)
Diffstat (limited to 'loadtime5')
-rw-r--r--loadtime5/java5-src/org/aspectj/weaver/loadtime/Agent.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/loadtime5/java5-src/org/aspectj/weaver/loadtime/Agent.java b/loadtime5/java5-src/org/aspectj/weaver/loadtime/Agent.java
index bb3489841..4989c0275 100644
--- a/loadtime5/java5-src/org/aspectj/weaver/loadtime/Agent.java
+++ b/loadtime5/java5-src/org/aspectj/weaver/loadtime/Agent.java
@@ -39,6 +39,10 @@ public class Agent {
* @param instrumentation
*/
public static void premain(String options, Instrumentation instrumentation) {
+ /* Handle duplicate agents */
+ if (s_instrumentation != null) {
+ return;
+ }
s_instrumentation = instrumentation;
s_instrumentation.addTransformer(s_transformer);
}