[jboss-cvs] JBossAS SVN: r63512 - projects/aop/trunk/aop/src/main/org/jboss/aop/instrument.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Jun 13 17:39:13 EDT 2007
Author: flavia.rainone at jboss.com
Date: 2007-06-13 17:39:13 -0400 (Wed, 13 Jun 2007)
New Revision: 63512
Modified:
projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/ConByConJoinPointGenerator.java
projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/ConByMethodJoinPointGenerator.java
projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/ConstructionJoinPointGenerator.java
projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/ConstructorJoinPointGenerator.java
projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/FieldJoinPointGenerator.java
projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/JoinPointGenerator.java
projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/MethodByConJoinPointGenerator.java
projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/MethodByMethodJoinPointGenerator.java
projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/MethodJoinPointGenerator.java
Log:
[JBAOP-385] Now we have an uniform treatment of exceptions thrown by advices: they are simply rethrown.
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/ConByConJoinPointGenerator.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/ConByConJoinPointGenerator.java 2007-06-13 20:54:31 UTC (rev 63511)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/ConByConJoinPointGenerator.java 2007-06-13 21:39:13 UTC (rev 63512)
@@ -320,7 +320,7 @@
targetClass,
INVOKE_JOINPOINT,
getInvokeJoinPointParameters(),
- targetCtor.getExceptionTypes(),
+ THROWS_THROWABLE,
null,
jp);
invokeJoinpointMethod.setModifiers(Modifier.PROTECTED);
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/ConByMethodJoinPointGenerator.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/ConByMethodJoinPointGenerator.java 2007-06-13 20:54:31 UTC (rev 63511)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/ConByMethodJoinPointGenerator.java 2007-06-13 21:39:13 UTC (rev 63512)
@@ -346,7 +346,7 @@
targetClass,
INVOKE_JOINPOINT,
getInvokeJoinPointParams(),
- targetCtor.getExceptionTypes(),
+ THROWS_THROWABLE,
null,
jp);
invokeJoinpointMethod.setModifiers(Modifier.PROTECTED);
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/ConstructionJoinPointGenerator.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/ConstructionJoinPointGenerator.java 2007-06-13 20:54:31 UTC (rev 63511)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/ConstructionJoinPointGenerator.java 2007-06-13 21:39:13 UTC (rev 63512)
@@ -297,7 +297,7 @@
CtClass.voidType,
INVOKE_JOINPOINT,
params,
- advisedCtor.getExceptionTypes(),
+ THROWS_THROWABLE,
null,
jp);
invokeJoinpointMethod.setModifiers(Modifier.PROTECTED);
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/ConstructorJoinPointGenerator.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/ConstructorJoinPointGenerator.java 2007-06-13 20:54:31 UTC (rev 63511)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/ConstructorJoinPointGenerator.java 2007-06-13 21:39:13 UTC (rev 63512)
@@ -275,7 +275,7 @@
advisedClass,
INVOKE_JOINPOINT,
params,
- advisedCtor.getExceptionTypes(),
+ THROWS_THROWABLE,
null,
jp);
invokeJoinpointMethod.setModifiers(Modifier.PROTECTED);
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/FieldJoinPointGenerator.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/FieldJoinPointGenerator.java 2007-06-13 20:54:31 UTC (rev 63511)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/FieldJoinPointGenerator.java 2007-06-13 21:39:13 UTC (rev 63512)
@@ -498,7 +498,7 @@
advisedField.getType(),
INVOKE_JOINPOINT,
getInvokeJoinPointParams(),
- new CtClass[0],
+ THROWS_THROWABLE,
null,
jp);
invokeJoinpointMethod.setModifiers(Modifier.PROTECTED);
@@ -584,7 +584,7 @@
CtClass.voidType,
JoinPointGenerator.INVOKE_JOINPOINT,
getInvokeJoinPointParams(),
- new CtClass[0],
+ THROWS_THROWABLE,
null,
jp);
invokeJoinpointMethod.setModifiers(Modifier.PROTECTED);
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/JoinPointGenerator.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/JoinPointGenerator.java 2007-06-13 20:54:31 UTC (rev 63511)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/JoinPointGenerator.java 2007-06-13 21:39:13 UTC (rev 63512)
@@ -88,6 +88,22 @@
protected static final String ARGUMENTS= "arguments";
private static final String GET_ARGUMENTS= OptimizedBehaviourInvocations.GET_ARGUMENTS + "()";
protected static final CtClass[] EMPTY_CTCLASS_ARRAY = new CtClass[0];
+ protected static final CtClass[] THROWS_THROWABLE;
+ static
+ {
+ try
+ {
+ THROWS_THROWABLE = new CtClass[]{
+ AspectManager.instance().findClassPool(
+ Thread.currentThread().getContextClassLoader()).
+ get("java.lang.Throwable")};
+ } catch (NotFoundException e)
+ {
+ throw new RuntimeException(e);
+ }
+
+ }
+
private final ArrayList<Integer> joinPointArguments;
private final boolean nullArgsArray;
@@ -622,8 +638,8 @@
afterCode.append(THROWABLE).append(" = ").append("throwable;");
argsFoundAfter = defaultCall.addInvokeCode(this,
setups.getByType(AdviceType.THROWING), afterCode, info) || argsFoundAfter;
-
- addHandleExceptionCode(afterCode, declaredExceptions);
+ afterCode.append("throw t;");
+ //addHandleExceptionCode(afterCode, declaredExceptions);
afterCode.append(" }");
AdviceSetup[] finallySetups = setups.getByType(AdviceType.FINALLY);
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/MethodByConJoinPointGenerator.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/MethodByConJoinPointGenerator.java 2007-06-13 20:54:31 UTC (rev 63511)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/MethodByConJoinPointGenerator.java 2007-06-13 21:39:13 UTC (rev 63512)
@@ -371,7 +371,7 @@
targetMethod.getReturnType(),
INVOKE_JOINPOINT,
getInvokeJoinPointParameters(),
- targetMethod.getExceptionTypes(),
+ THROWS_THROWABLE,
null,
jp);
invokeJoinpointMethod.setModifiers(Modifier.PROTECTED);
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/MethodByMethodJoinPointGenerator.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/MethodByMethodJoinPointGenerator.java 2007-06-13 20:54:31 UTC (rev 63511)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/MethodByMethodJoinPointGenerator.java 2007-06-13 21:39:13 UTC (rev 63512)
@@ -376,7 +376,7 @@
targetMethod.getReturnType(),
INVOKE_JOINPOINT,
getInvokeJoinpointParameters(),
- targetMethod.getExceptionTypes(),
+ THROWS_THROWABLE,
null,
jp);
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/MethodJoinPointGenerator.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/MethodJoinPointGenerator.java 2007-06-13 20:54:31 UTC (rev 63511)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/MethodJoinPointGenerator.java 2007-06-13 21:39:13 UTC (rev 63512)
@@ -355,7 +355,7 @@
advisedMethod.getReturnType(),
INVOKE_JOINPOINT,
params,
- advisedMethod.getExceptionTypes(),
+ THROWS_THROWABLE,
null,
jp);
invokeJoinpointMethod.setModifiers(Modifier.PROTECTED);
More information about the jboss-cvs-commits
mailing list