[jboss-cvs] JBossAS SVN: r59826 - branches/Branch_AOP_1_5/aop/src/main/org/jboss/aop/instrument.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Jan 19 09:11:20 EST 2007
Author: kabir.khan at jboss.com
Date: 2007-01-19 09:11:19 -0500 (Fri, 19 Jan 2007)
New Revision: 59826
Modified:
branches/Branch_AOP_1_5/aop/src/main/org/jboss/aop/instrument/Instrumentor.java
Log:
Revert to 59554
Modified: branches/Branch_AOP_1_5/aop/src/main/org/jboss/aop/instrument/Instrumentor.java
===================================================================
--- branches/Branch_AOP_1_5/aop/src/main/org/jboss/aop/instrument/Instrumentor.java 2007-01-19 14:00:25 UTC (rev 59825)
+++ branches/Branch_AOP_1_5/aop/src/main/org/jboss/aop/instrument/Instrumentor.java 2007-01-19 14:11:19 UTC (rev 59826)
@@ -593,28 +593,15 @@
for (ReferenceClassIterator it = new ReferenceClassIterator(clazz.getRefClasses()) ; it.hasNext() ; )
{
ref = it.next();
- System.out.println("----> convert? " + ref + " " + manager.convertReference(ref));
- if (manager.isNonAdvisableClassName(ref)
- || ref.startsWith("java.")
- || ref.startsWith("javax.")
- || ref.startsWith("["))
+ if (!manager.convertReference(ref)
+ || manager.isNonAdvisableClassName(ref)
+ || ref.startsWith("java.")
+ || ref.startsWith("javax.")
+ || ref.startsWith("["))
{
continue;
}
- final boolean convertReferences = manager.convertReference(ref);
- if (!convertReferences)
- {
- //See comment in JBAOP-346 for an explanation, but basically the *direct* superclass may not be woven, but fields from
- //the *direct* superclasses parents may be woven.
- CtClass superClazz = clazz.getSuperclass();
- if (superClazz == null || !superClazz.getName().equals(ref))
- {
- //The referenced class is not our super class
- continue;
- }
- }
-
// Only need a temporary advisor for resolving metadata
CtClass ctRef = null;
try
@@ -639,7 +626,6 @@
it.addSuperClass(ctRef);
ClassAdvisor advisor = manager.getTempClassAdvisor(ctRef);
- System.out.println("------> REFCLASS " + ctRef.getName());
if (!manager.shouldSkipFieldAccess(ref) && !ref.equals(clazz.getName()))
{
List fields = getAdvisableFields(ctRef);
@@ -653,7 +639,7 @@
manager.skipFieldAccess(ref);
}
}
- if (convertReferences && !manager.shouldSkipConstruction(ref))
+ if (!manager.shouldSkipConstruction(ref))
{
if (constructorExecutionTransformer.replaceConstructorAccess(advisor, ctRef))
{
@@ -710,7 +696,7 @@
if (AspectManager.verbose) System.out.println("[trying to transform] " + clazz.getName());
DeclareChecker.checkDeclares(manager, clazz, advisor);
- System.out.println("===================> " + clazz.getName());
+
boolean converted = instrumentAnnotationIntroductions(clazz, advisor);
converted = instrumentAnnotationOverrides(clazz, advisor) || converted;
boolean constructorAccessConverted = false;
@@ -1145,9 +1131,4 @@
}
}
}
-
- AspectManager getManager()
- {
- return manager;
- }
}
\ No newline at end of file
More information about the jboss-cvs-commits
mailing list