From: aclement <aclement>
Date: Thu, 13 May 2010 17:21:55 +0000 (+0000)
Subject: overweaving and tjp
X-Git-Tag: V1_6_9M2~1
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=b07cb6eaee9681bf8ee9a38d389005425ea9ffb6;p=aspectj.git

overweaving and tjp
---

diff --git a/weaver/src/org/aspectj/weaver/bcel/BcelClassWeaver.java b/weaver/src/org/aspectj/weaver/bcel/BcelClassWeaver.java
index 1bef5f968..547f0ad7d 100644
--- a/weaver/src/org/aspectj/weaver/bcel/BcelClassWeaver.java
+++ b/weaver/src/org/aspectj/weaver/bcel/BcelClassWeaver.java
@@ -3048,8 +3048,11 @@ class BcelClassWeaver implements IClassWeaver {
 				if (world.isOverWeaving()) {
 					String s = invoke.getClassName(mg.getConstantPool());
 					// skip all the inc/dec/isValid/etc
-					if (s.equals("org.aspectj.runtime.internal.CFlowCounter")
-							|| s.equals("org.aspectj.runtime.internal.CFlowStack")) {
+					if (s.length() > 4
+							&& s.charAt(4) == 'a'
+							&& (s.equals("org.aspectj.runtime.internal.CFlowCounter")
+									|| s.equals("org.aspectj.runtime.internal.CFlowStack") || s
+									.equals("org.aspectj.runtime.reflect.Factory"))) {
 						proceed = false;
 					} else {
 						if (methodName.equals("aspectOf")) {