diff options
| -rw-r--r-- | tests/ltw/callMunging/aop.xml | 2 | ||||
| -rw-r--r-- | tests/ltw/callMunging/case1/aop.xml | 2 | ||||
| -rw-r--r-- | tests/ltw/callMunging/case2/aop.xml | 2 | ||||
| -rw-r--r-- | tests/ltw/callMunging/case3/aop.xml | 2 | ||||
| -rw-r--r-- | tests/ltw/hier/aop-single.xml | 2 | ||||
| -rw-r--r-- | weaver/src/org/aspectj/weaver/World.java | 8 |
6 files changed, 9 insertions, 9 deletions
diff --git a/tests/ltw/callMunging/aop.xml b/tests/ltw/callMunging/aop.xml index 321117898..2005d8c86 100644 --- a/tests/ltw/callMunging/aop.xml +++ b/tests/ltw/callMunging/aop.xml @@ -1,5 +1,5 @@ <aspectj> -<weaver options="-showWeaveInfo -verbose"/> +<weaver options="-showWeaveInfo -verbose -Xset:completeBinaryTypes=true"/> <aspects> <aspect name="X"/> </aspects> diff --git a/tests/ltw/callMunging/case1/aop.xml b/tests/ltw/callMunging/case1/aop.xml index 321117898..2005d8c86 100644 --- a/tests/ltw/callMunging/case1/aop.xml +++ b/tests/ltw/callMunging/case1/aop.xml @@ -1,5 +1,5 @@ <aspectj> -<weaver options="-showWeaveInfo -verbose"/> +<weaver options="-showWeaveInfo -verbose -Xset:completeBinaryTypes=true"/> <aspects> <aspect name="X"/> </aspects> diff --git a/tests/ltw/callMunging/case2/aop.xml b/tests/ltw/callMunging/case2/aop.xml index 321117898..2005d8c86 100644 --- a/tests/ltw/callMunging/case2/aop.xml +++ b/tests/ltw/callMunging/case2/aop.xml @@ -1,5 +1,5 @@ <aspectj> -<weaver options="-showWeaveInfo -verbose"/> +<weaver options="-showWeaveInfo -verbose -Xset:completeBinaryTypes=true"/> <aspects> <aspect name="X"/> </aspects> diff --git a/tests/ltw/callMunging/case3/aop.xml b/tests/ltw/callMunging/case3/aop.xml index 321117898..2005d8c86 100644 --- a/tests/ltw/callMunging/case3/aop.xml +++ b/tests/ltw/callMunging/case3/aop.xml @@ -1,5 +1,5 @@ <aspectj> -<weaver options="-showWeaveInfo -verbose"/> +<weaver options="-showWeaveInfo -verbose -Xset:completeBinaryTypes=true"/> <aspects> <aspect name="X"/> </aspects> diff --git a/tests/ltw/hier/aop-single.xml b/tests/ltw/hier/aop-single.xml index 9546f8c60..017f80ce5 100644 --- a/tests/ltw/hier/aop-single.xml +++ b/tests/ltw/hier/aop-single.xml @@ -1,5 +1,5 @@ <aspectj> - <weaver options="-showWeaveInfo"/> + <weaver options="-showWeaveInfo -Xset:completeBinaryTypes=true"/> <aspects> <aspect name="child.Advisor"/> </aspects> diff --git a/weaver/src/org/aspectj/weaver/World.java b/weaver/src/org/aspectj/weaver/World.java index 56d65a0c3..b692500c7 100644 --- a/weaver/src/org/aspectj/weaver/World.java +++ b/weaver/src/org/aspectj/weaver/World.java @@ -109,7 +109,7 @@ public abstract class World implements Dump.INode { private boolean fastDelegateSupportEnabled = isASMAround; private boolean runMinimalMemory = false; private boolean shouldPipelineCompilation = true; - private boolean completeBinaryTypes = true; + private boolean completeBinaryTypes = false; public boolean forDEBUG_structuralChangesCode = false; public boolean forDEBUG_bridgingCode = false; @@ -787,7 +787,7 @@ public abstract class World implements Dump.INode { public final static String xsetPIPELINE_COMPILATION = "pipelineCompilation"; public final static String xsetPIPELINE_COMPILATION_DEFAULT = "true"; public final static String xsetCOMPLETE_BINARY_TYPES = "completeBinaryTypes"; - public final static String xsetCOMPLETE_BINARY_TYPES_DEFAULT = "true"; + public final static String xsetCOMPLETE_BINARY_TYPES_DEFAULT = "false"; public boolean isInJava5Mode() { return behaveInJava5Way; @@ -1177,8 +1177,8 @@ public abstract class World implements Dump.INode { s = p.getProperty(xsetCOMPLETE_BINARY_TYPES,xsetCOMPLETE_BINARY_TYPES_DEFAULT); completeBinaryTypes = s.equalsIgnoreCase("true"); - if (!completeBinaryTypes) { - getMessageHandler().handleMessage(MessageUtil.info("[completeBinaryTypes=false] Completion of binary types deactivated")); + if (completeBinaryTypes) { + getMessageHandler().handleMessage(MessageUtil.info("[completeBinaryTypes=true] Completion of binary types activated")); } s = p.getProperty(xsetRUN_MINIMAL_MEMORY,"false"); |