[jboss-cvs] JBossAS SVN: r103340 - in projects/aop/trunk/aop/src/main/java/org/jboss/aop: instrument and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Mar 31 10:55:03 EDT 2010
Author: flavia.rainone at jboss.com
Date: 2010-03-31 10:55:02 -0400 (Wed, 31 Mar 2010)
New Revision: 103340
Modified:
projects/aop/trunk/aop/src/main/java/org/jboss/aop/SuperClassesFirstWeavingStrategy.java
projects/aop/trunk/aop/src/main/java/org/jboss/aop/instrument/Instrumentor.java
Log:
[JBAOP-785] Removed the stack trace logging messages
Modified: projects/aop/trunk/aop/src/main/java/org/jboss/aop/SuperClassesFirstWeavingStrategy.java
===================================================================
--- projects/aop/trunk/aop/src/main/java/org/jboss/aop/SuperClassesFirstWeavingStrategy.java 2010-03-31 14:46:33 UTC (rev 103339)
+++ projects/aop/trunk/aop/src/main/java/org/jboss/aop/SuperClassesFirstWeavingStrategy.java 2010-03-31 14:55:02 UTC (rev 103340)
@@ -92,9 +92,24 @@
if (!(ex instanceof NotFoundException))
{
if (verbose)
- logger.error(ex);
+ logger.warn(ex);
else
- logger.error(ex.getMessage()+".. Do verbose mode if you want full stack trace.");
+ {
+ // hack to avoid having to change the signature of 1/3 of the JBoss AOP classes
+ // TODO this should be reviewed
+ Throwable cause = ex.getCause();
+ while (cause.getCause() != null)
+ {
+ cause = cause.getCause();
+ }
+ if (cause != null && cause instanceof NotFoundException)
+ {
+ if (verbose)
+ logger.warn(ex);
+ }
+ else
+ logger.error(ex.getMessage()+".. Do verbose mode if you want full stack trace.");
+ }
}
throw ex;
}
@@ -130,92 +145,82 @@
{
return null;
}
- try
+ CtClass superClass = clazz.getSuperclass();
+ if (superClass != null && !Instrumentor.implementsAdvised(clazz))
{
- CtClass superClass = clazz.getSuperclass();
- if (superClass != null && !Instrumentor.implementsAdvised(clazz))
+ ClassPool superPool = superClass.getClassPool();
+ if (superPool != null && superPool instanceof AbstractClassPool)
{
- ClassPool superPool = superClass.getClassPool();
- if (superPool != null && superPool instanceof AbstractClassPool)
+ AspectManager aspectManager = manager;
+ if (manager instanceof Domain && superPool != pool)
{
- AspectManager aspectManager = manager;
- if (manager instanceof Domain && superPool != pool)
- {
- //We are in a scoped classloader and the superclass is not
- aspectManager = AspectManager.instance(superPool.getClassLoader());
- }
- instrumentClass(aspectManager, (ScopedClassPool) superPool, superClass, false);
+ //We are in a scoped classloader and the superclass is not
+ aspectManager = AspectManager.instance(superPool.getClassLoader());
}
+ instrumentClass(aspectManager, (ScopedClassPool) superPool, superClass, false);
}
+ }
- if (manager.isNonAdvisableClassName(clazz.getName()))
- {
- return null;
- }
+ if (manager.isNonAdvisableClassName(clazz.getName()))
+ {
+ return null;
+ }
- if (clazz.isArray())
- {
- if (verbose && logger.isDebugEnabled()) logger.debug("cannot compile, isArray: " + clazz.getName());
- pool.flushClass(clazz.getName());
+ if (clazz.isArray())
+ {
+ if (verbose && logger.isDebugEnabled()) logger.debug("cannot compile, isArray: " + clazz.getName());
+ pool.flushClass(clazz.getName());
+ return null;
+ }
+ if (clazz.isFrozen())
+ {
+ if(isAdvised(pool, clazz))
return null;
- }
- if (clazz.isFrozen())
+ if (verbose && logger.isDebugEnabled()) logger.debug("warning, isFrozen: " + clazz.getName() + " " + clazz.getClassPool());
+ if (!isLoadedClass)
{
- if(isAdvised(pool, clazz))
- return null;
- if (verbose && logger.isDebugEnabled()) logger.debug("warning, isFrozen: " + clazz.getName() + " " + clazz.getClassPool());
- if (!isLoadedClass)
- {
- //What's the point of this?
- clazz = obtainCtClassInfo(pool, clazz.getName(), null);
- }
- else
- return null;
- //info.getClazz().defrost();
+ //What's the point of this?
+ clazz = obtainCtClassInfo(pool, clazz.getName(), null);
}
+ else
+ return null;
+ //info.getClazz().defrost();
+ }
- boolean transformed = isAdvised(pool, clazz);
- if (!transformed)
- {
- ClassAdvisor advisor =
- AdvisorFactory.getClassAdvisor(clazz, manager);
- Instrumentor instrumentor = InstrumentorFactory.getInstrumentor(
- pool,
- manager,
- manager.dynamicStrategy.getJoinpointClassifier(),
- manager.dynamicStrategy.getDynamicTransformationObserver(clazz));
+ boolean transformed = isAdvised(pool, clazz);
+ if (!transformed)
+ {
+ ClassAdvisor advisor =
+ AdvisorFactory.getClassAdvisor(clazz, manager);
+ Instrumentor instrumentor = InstrumentorFactory.getInstrumentor(
+ pool,
+ manager,
+ manager.dynamicStrategy.getJoinpointClassifier(),
+ manager.dynamicStrategy.getDynamicTransformationObserver(clazz));
- if (!Instrumentor.isTransformable(clazz))
- {
- if (verbose && logger.isDebugEnabled()) logger.debug("cannot compile, implements Untransformable: " + clazz.getName());
- //Flushing the generated invocation classes breaks things further down the line
- //pool.flushClass(info.getClassName());
- return null;
- }
-
- manager.attachMetaData(advisor, clazz, true);
- manager.applyInterfaceIntroductions(advisor, clazz);
- transformed = instrumentor.transform(clazz, advisor);
- }
- if (transformed)
+ if (!Instrumentor.isTransformable(clazz))
{
- return clazz;
+ if (verbose && logger.isDebugEnabled()) logger.debug("cannot compile, implements Untransformable: " + clazz.getName());
+ //Flushing the generated invocation classes breaks things further down the line
+ //pool.flushClass(info.getClassName());
+ return null;
}
-
- if (isLoadedClass)
- {
- WeavingRegistry.setClassLoadedButNotWoven(pool, clazz.getName());
- }
-
- return null;
+
+ manager.attachMetaData(advisor, clazz, true);
+ manager.applyInterfaceIntroductions(advisor, clazz);
+ transformed = instrumentor.transform(clazz, advisor);
}
- catch(Exception e)
+ if (transformed)
{
- throw new RuntimeException("Error converting class ", e);
+ return clazz;
}
- finally
+
+ if (isLoadedClass)
{
+ WeavingRegistry.setClassLoadedButNotWoven(pool, clazz.getName());
}
+
+ return null;
}
public boolean isAdvised(ClassPool pool, CtClass clazz) throws NotFoundException
Modified: projects/aop/trunk/aop/src/main/java/org/jboss/aop/instrument/Instrumentor.java
===================================================================
--- projects/aop/trunk/aop/src/main/java/org/jboss/aop/instrument/Instrumentor.java 2010-03-31 14:46:33 UTC (rev 103339)
+++ projects/aop/trunk/aop/src/main/java/org/jboss/aop/instrument/Instrumentor.java 2010-03-31 14:55:02 UTC (rev 103340)
@@ -790,7 +790,7 @@
{
if (AspectManager.suppressReferenceErrors)
{
- System.err.println("[warn] Could not find class " +
+ logger.warn("Could not find class " +
refClassName +
" (or one of its implemented interfaces) that " +
clazz.getName() + " references. It may not be in your " +
@@ -921,7 +921,7 @@
{
if (AspectManager.suppressTransformationErrors)
{
- logger.error("[warn] AOP Instrumentor failed to transform " + clazz.getName(), e);
+ logger.warn("AOP Instrumentor failed to transform " + clazz.getName());
return false;
}
else
More information about the jboss-cvs-commits
mailing list