more overweaving tests and fixes: method call/field get/set

diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/World.java b/org.aspectj.matcher/src/org/aspectj/weaver/World.java
index cf38789ffa05ca18a4647fb29e968e86a302fe78..d5259de48a34f34abc1fa6d87bf5b4333159211b 100644 (file)
--- a/org.aspectj.matcher/src/org/aspectj/weaver/World.java
+++ b/org.aspectj.matcher/src/org/aspectj/weaver/World.java
@@ -317,7 +317,7 @@ public abstract class World implements Dump.INode {
                }
        }
 
-    // Only need one representation of '?' in a world - can be shared
+       // Only need one representation of '?' in a world - can be shared
        private BoundedReferenceType wildcard;
 
        private BoundedReferenceType getWildcard() {
@@ -1366,6 +1366,7 @@ public abstract class World implements Dump.INode {
        }
 
        public void ensureAdvancedConfigurationProcessed() {
+
                // Check *once* whether the user has switched asm support off
                if (!checkedAdvancedConfiguration) {
                        Properties p = getExtraConfiguration();
@@ -1459,6 +1460,16 @@ public abstract class World implements Dump.INode {
                                }
 
                        }
+                       try{
+                         String value = System.getProperty("aspectj.overweaving", "false");
+                         if (value.equalsIgnoreCase("true")) {
+                               System.out.println("ASPECTJ: aspectj.overweaving=true: overweaving switched ON");
+                               overWeaving = true;
+                         }
+                       } catch (Throwable t) {
+                         System.err.println("ASPECTJ: Unable to read system properties");
+                         t.printStackTrace();
+                       }
                        checkedAdvancedConfiguration = true;
                }
        }