Fix for pr92880: I've removed the exception clause from the declaration of ajc$getInstance() and modified the internals to return null if an exception occurs rather than rethrowing it. I've only changed the code gen in the compiler layer, not in the weaver layer. (interestingly with only my compiler layer change, no tests fail...)

1 files changed, 3 insertions, 3 deletions

diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AspectDeclaration.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AspectDeclaration.java
index 1b0d3eaea..1039559cc 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AspectDeclaration.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AspectDeclaration.java
@@ -749,9 +749,9 @@ public class AspectDeclaration extends TypeDeclaration {
 					exc.placeEnd();
 					codeStream.areturn();
 					exc.place();
-					codeStream.astore_1();
-					codeStream.aload_1();
-					codeStream.athrow();					
+					// this just returns null now - the old version used to throw the caught exception!
+					codeStream.aconst_null();
+					codeStream.areturn();
 				}});
 		}