diff options
| author | avasseur <avasseur> | 2005-08-17 07:39:47 +0000 |
|---|---|---|
| committer | avasseur <avasseur> | 2005-08-17 07:39:47 +0000 |
| commit | f9a425cb10da59c629fea56861f26967b22b1766 (patch) | |
| tree | f279e24f67117ab554bef51099e690c70003cbab | |
| parent | 2a599cb4edaf0f5815ad685e1dfe5f8d8c3ccaba (diff) | |
| download | aspectj-f9a425cb10da59c629fea56861f26967b22b1766.tar.gz aspectj-f9a425cb10da59c629fea56861f26967b22b1766.zip | |
@AJ PTW polish as per aj$getInstance does not rethrow the exc but return null #92880
| -rw-r--r-- | tests/src/org/aspectj/systemtest/ajc150/ataspectj/syntax.xml | 8 | ||||
| -rw-r--r-- | weaver/src/org/aspectj/weaver/bcel/BcelPerClauseAspectAdder.java | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/tests/src/org/aspectj/systemtest/ajc150/ataspectj/syntax.xml b/tests/src/org/aspectj/systemtest/ajc150/ataspectj/syntax.xml index e21a6b68c..cb1f2abb7 100644 --- a/tests/src/org/aspectj/systemtest/ajc150/ataspectj/syntax.xml +++ b/tests/src/org/aspectj/systemtest/ajc150/ataspectj/syntax.xml @@ -72,16 +72,16 @@ <compile files="ataspectj/IfPointcutTest.java,ataspectj/TestHelper.java" options="-1.5 -Xdev:NoAtAspectJProcessing"/> <run class="ataspectj.IfPointcutTest"/> <!-- FIXME AV - Adrian in JDT stuff --> -<!-- <compile files="ataspectj/IfPointcutTest.java,ataspectj/TestHelper.java" options="-1.5"/>--> -<!-- <run class="ataspectj.IfPointcutTest"/>--> + <!--<compile files="ataspectj/IfPointcutTest.java,ataspectj/TestHelper.java" options="-1.5"/>--> + <!--<run class="ataspectj.IfPointcutTest"/>--> </ajc-test> <ajc-test dir="java5/ataspectj" title="IfPointcut2Test"> <compile files="ataspectj/IfPointcut2Test.java,ataspectj/TestHelper.java" options="-1.5 -Xdev:NoAtAspectJProcessing"/> <run class="ataspectj.IfPointcut2Test"/> <!-- FIXME AV - Adrian in JDT stuff --> -<!-- <compile files="ataspectj/IfPointcut2Test.java,ataspectj/TestHelper.java" options="-1.5"/>--> -<!-- <run class="ataspectj.IfPointcut2Test"/>--> + <!--<compile files="ataspectj/IfPointcut2Test.java,ataspectj/TestHelper.java" options="-1.5"/>--> + <!--<run class="ataspectj.IfPointcut2Test"/>--> </ajc-test> <ajc-test dir="java5/ataspectj" title="BindingTest"> diff --git a/weaver/src/org/aspectj/weaver/bcel/BcelPerClauseAspectAdder.java b/weaver/src/org/aspectj/weaver/bcel/BcelPerClauseAspectAdder.java index cd5de4874..87ca7852b 100644 --- a/weaver/src/org/aspectj/weaver/bcel/BcelPerClauseAspectAdder.java +++ b/weaver/src/org/aspectj/weaver/bcel/BcelPerClauseAspectAdder.java @@ -494,8 +494,8 @@ public class BcelPerClauseAspectAdder extends BcelTypeMunger { il.append(InstructionConstants.ARETURN); InstructionHandle handler = il.append(InstructionConstants.ASTORE_1); - il.append(InstructionConstants.ALOAD_1); - il.append(InstructionConstants.ATHROW); + il.append(InstructionConstants.ACONST_NULL); + il.append(InstructionConstants.ARETURN); method.addExceptionHandler( tryStart, handler.getPrev(), handler, new ObjectType("java.lang.Exception"), false |