better errors for issingleton aspects advising own initializers

also correct typing for dynamic checks on parameters to if pcds

1 files changed, 10 insertions, 0 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 26bf18d8b..a52d3cad1 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
@@ -499,7 +499,17 @@ public class AspectDeclaration extends MemberTypeDeclaration {
 				// body starts here
 				codeStream.getstatic(world.makeFieldBinding(AjcMemberMaker.perSingletonField(
 						typeX)));
+				Label isNull = new Label(codeStream);
+				codeStream.dup();
+				codeStream.ifnull(isNull);
 				codeStream.areturn();
+				isNull.place();
+				codeStream.new_(world.makeTypeBinding(AjcMemberMaker.NO_ASPECT_BOUND_EXCEPTION));
+				codeStream.dup();
+				codeStream.invokespecial(world.makeMethodBindingForCall(
+					AjcMemberMaker.noAspectBoundExceptionInit()
+				));
+				codeStream.athrow();
 				// body ends here
 			}});
 	}