diff options
| author | avasseur <avasseur> | 2005-11-07 11:02:00 +0000 |
|---|---|---|
| committer | avasseur <avasseur> | 2005-11-07 11:02:00 +0000 |
| commit | d53fe2aeac3c48998da570516a3d3810fb3a40fe (patch) | |
| tree | 92c454ca37c0f5f9ffeec20bb4adc7526e8d6b3b | |
| parent | e951f5240c0b786e7e2a4d1144de6e41744a07f9 (diff) | |
| download | aspectj-d53fe2aeac3c48998da570516a3d3810fb3a40fe.tar.gz aspectj-d53fe2aeac3c48998da570516a3d3810fb3a40fe.zip | |
#114897 notreweavable is default on LTW - by Matthew Webster.
3 files changed, 6 insertions, 6 deletions
diff --git a/loadtime/src/org/aspectj/weaver/loadtime/Options.java b/loadtime/src/org/aspectj/weaver/loadtime/Options.java index 705c585dd..5bc469470 100644 --- a/loadtime/src/org/aspectj/weaver/loadtime/Options.java +++ b/loadtime/src/org/aspectj/weaver/loadtime/Options.java @@ -35,7 +35,7 @@ public class Options { private final static String OPTION_noWarnNone = "-warn:none"; private final static String OPTION_proceedOnError = "-proceedOnError"; private final static String OPTION_verbose = "-verbose"; - private final static String OPTION_notReweavable = "-XNotReweavable"; + private final static String OPTION_reweavable = "-Xreweavable";//notReweavable is default for LTW private final static String OPTION_noinline = "-Xnoinline"; private final static String OPTION_hasMember = "-XhasMember"; private final static String OPTION_pinpoint = "-Xdev:pinpoint"; @@ -91,8 +91,8 @@ public class Options { weaverOption.noWarn = true; } else if (arg.equalsIgnoreCase(OPTION_proceedOnError)) { weaverOption.proceedOnError = true; - } else if (arg.equalsIgnoreCase(OPTION_notReweavable)) { - weaverOption.notReWeavable = true; + } else if (arg.equalsIgnoreCase(OPTION_reweavable)) { + weaverOption.notReWeavable = false; } else if (arg.equalsIgnoreCase(OPTION_showWeaveInfo)) { weaverOption.showWeaveInfo = true; } else if (arg.equalsIgnoreCase(OPTION_hasMember)) { @@ -144,7 +144,7 @@ public class Options { boolean noWarn; boolean proceedOnError; boolean verbose; - boolean notReWeavable; + boolean notReWeavable = true;//default to notReweavable for LTW (faster) boolean noInline; boolean showWeaveInfo; boolean pinpoint; diff --git a/tests/java5/ataspectj/ataspectj/ltwlog/aop-verbose.xml b/tests/java5/ataspectj/ataspectj/ltwlog/aop-verbose.xml index 82702105f..c7756c8e5 100644 --- a/tests/java5/ataspectj/ataspectj/ltwlog/aop-verbose.xml +++ b/tests/java5/ataspectj/ataspectj/ltwlog/aop-verbose.xml @@ -1,5 +1,5 @@ <aspectj> - <weaver options="-XmessageHandlerClass:ataspectj.ltwlog.MessageHolder -verbose -xNotReweavable"/> + <weaver options="-XmessageHandlerClass:ataspectj.ltwlog.MessageHolder -verbose"/> <aspects> <aspect name="ataspectj.ltwlog.Aspect1"/> </aspects> diff --git a/tests/java5/ataspectj/ataspectj/ltwlog/aop-verboseandshow.xml b/tests/java5/ataspectj/ataspectj/ltwlog/aop-verboseandshow.xml index 11ace2a93..492d6df63 100644 --- a/tests/java5/ataspectj/ataspectj/ltwlog/aop-verboseandshow.xml +++ b/tests/java5/ataspectj/ataspectj/ltwlog/aop-verboseandshow.xml @@ -1,5 +1,5 @@ <aspectj> - <weaver options="-XmessageHandlerClass:ataspectj.ltwlog.MessageHolder -showWeaveInfo -verbose"/> + <weaver options="-XmessageHandlerClass:ataspectj.ltwlog.MessageHolder -showWeaveInfo -verbose -Xreweavable"/> <aspects> <aspect name="ataspectj.ltwlog.Aspect1"/> </aspects> |