290227: fix and test

5 files changed, 60 insertions, 0 deletions

diff --git a/tests/bugs166/pr290227/AbstractTimingAnnotatedAspect.java b/tests/bugs166/pr290227/AbstractTimingAnnotatedAspect.java
new file mode 100644
index 000000000..512f48ba1
--- /dev/null
+++ b/tests/bugs166/pr290227/AbstractTimingAnnotatedAspect.java
@@ -0,0 +1,39 @@
+package aspects;
+
+import org.aspectj.lang.JoinPoint;
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Before;
+import org.aspectj.lang.annotation.Pointcut;
+
+@ Aspect
+public abstract class AbstractTimingAnnotatedAspect {
+
+	@Pointcut("within(*..AbstractJPivotPortlet+) " +
+			"&& (execution(* do*(..))" +
+			"|| execution(* processAction*(..))" +
+			"|| execution(* serveResource*(..)) )")
+	protected final void portletEntryMethods() {}
+
+	@Pointcut("execution(* eu.ibacz.pbns..*.*(..)) || execution(* com.tonbeller..*.*(..))")
+	protected final void tracedMethods() {}
+
+	@Pointcut("within(aspects.*) || within(aspects..*)")
+	protected final void thisAspectClasses() {}
+
+	@Pointcut("cflow(execution(* TimingAnnotatedAspect.processInvocationFinished(..)))")
+	protected final void thisAspectExecution() {}
+
+	@Pointcut
+	protected abstract void scope();
+
+	@Before("scope() && portletEntryMethods() && !thisAspectClasses() && !thisAspectExecution()")
+	public void logStackTrace(final JoinPoint thisJoinPoint) throws Throwable {
+		System.out.println("logStackTrace: Logging the current stack trace prior to " +
+				"the execution of " +
+				thisJoinPoint.getSignature().toShortString()
+				+ new Exception("Current stack trace print out."));
+	} /* logStackTrace */
+
+}
diff --git a/tests/bugs166/pr290227/TimingAnnotatedAspect.java b/tests/bugs166/pr290227/TimingAnnotatedAspect.java
new file mode 100644
index 000000000..4dc2b3bf4
--- /dev/null
+++ b/tests/bugs166/pr290227/TimingAnnotatedAspect.java
@@ -0,0 +1,13 @@
+package aspects;
+
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Pointcut;
+
+@ Aspect
+public class TimingAnnotatedAspect extends AbstractTimingAnnotatedAspect {
+
+	@Pointcut("")
+	protected void scope() {}
+
+
+}
diff --git a/tests/bugs166/pr290227/javacCode.jar b/tests/bugs166/pr290227/javacCode.jar
new file mode 100644
index 000000000..86b96bf4c
--- /dev/null
+++ b/tests/bugs166/pr290227/javacCode.jar
diff --git a/tests/src/org/aspectj/systemtest/ajc166/Ajc166Tests.java b/tests/src/org/aspectj/systemtest/ajc166/Ajc166Tests.java
index d90274798..714e81fac 100644
--- a/tests/src/org/aspectj/systemtest/ajc166/Ajc166Tests.java
+++ b/tests/src/org/aspectj/systemtest/ajc166/Ajc166Tests.java
@@ -18,6 +18,10 @@ import org.aspectj.testing.XMLBasedAjcTestCase;
 
 public class Ajc166Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
 
+	public void testNpeForJavacBuilt_290227() {
+		runTest("npe for javac built");
+	}
+
 	public void testBinaryDecpSuperRewrite_290087() {
 		runTest("binary decp super rewrite");
 	}
diff --git a/tests/src/org/aspectj/systemtest/ajc166/ajc166.xml b/tests/src/org/aspectj/systemtest/ajc166/ajc166.xml
index a1885afcc..991cfdb68 100644
--- a/tests/src/org/aspectj/systemtest/ajc166/ajc166.xml
+++ b/tests/src/org/aspectj/systemtest/ajc166/ajc166.xml
@@ -2,6 +2,10 @@
 
 <suite>
 
+  <ajc-test dir="bugs166/pr290227" title="npe for javac built">
+    <compile files="" inpath="javacCode.jar" options="-1.5 -Xlint:ignore"/>
+  </ajc-test>
+  
   <ajc-test dir="bugs166/pr288049" title="itd decanno">
      <compile files="org/othtests/MyClass.java org/othtests/MySubClass.java org/othtests/AddSomeAnnotation.java" options="-1.5 -showWeaveInfo">
      <message kind="weave" text="'public java.lang.String org.othtests.MySubClass.doOne()' (MySubClass.java:5) is annotated with"/>