From: aclement <aclement>
Date: Thu, 13 May 2010 04:05:22 +0000 (+0000)
Subject: more overweaving tests and fixes: method call/field get/set
X-Git-Tag: V1_6_9M2~7
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=c9ddef9fd762835484653acd5434ee366a3bc04a;p=aspectj.git

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 cf38789ff..d5259de48 100644
--- 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;
 		}
 	}