#114897 notreweavable is default on LTW - by Matthew Webster.

diff --git a/loadtime/src/org/aspectj/weaver/loadtime/Options.java b/loadtime/src/org/aspectj/weaver/loadtime/Options.java
index 705c585ddc661a87ac1e473c4873b48063e7e6bb..5bc469470345d408cad18fcbe252f334592e47bf 100644 (file)
--- 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 82702105fa2a9dae5afb74520ff858e5e38d6f29..c7756c8e57710347da6e08f269c9160b0930fc97 100644 (file)
--- 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 11ace2a932135133f77c1d1c8af50b95608a3490..492d6df63df150b93493f757c912f5a5ab730221 100644 (file)
--- 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>