Bug 158957 "NPE in LTW with RMI dynamic proxies w/ pointcut reuse" (ensure we can...

diff --git a/tests/bugs150/pr120474/$Proxy4.java b/tests/bugs150/pr120474/$Proxy4.java
index 3b617ca31b1c84cd7d6de1f13add229273ee6710..8da92d6c73af83d43cde568b67668502e85d1a36 100644 (file)
--- a/tests/bugs150/pr120474/$Proxy4.java
+++ b/tests/bugs150/pr120474/$Proxy4.java
@@ -1,3 +1,6 @@
 public class $Proxy4 {
   public void foo() {}
+  public static void main (String[] args) {
+         new $Proxy4().foo();
+  }
 }

diff --git a/tests/bugs150/pr120474/X.aj b/tests/bugs150/pr120474/X.aj
index c0dd297e5c1c9db698f33e74113a1840b0d8718f..550028016a335440a3abfb42d43efa07ad0f58bf 100644 (file)
--- a/tests/bugs150/pr120474/X.aj
+++ b/tests/bugs150/pr120474/X.aj
@@ -1,3 +1,5 @@
 public aspect X {
-  before(): execution(* foo(..)) && !within(X) { }
+  before(): execution(* foo(..)) && !within(X) { 
+         System.out.println(thisJoinPoint);
+  }
 }

diff --git a/tests/bugs150/pr120474/aop.xml b/tests/bugs150/pr120474/aop.xml
new file mode 100644 (file)
index 0000000..7032c15
--- /dev/null
+++ b/tests/bugs150/pr120474/aop.xml
@@ -0,0 +1,5 @@
+<aspectj>
+       <weaver options="-verbose -debug">
+               <exclude within="$Proxy*"/>
+       </weaver>
+</aspectj>
\ No newline at end of file

diff --git a/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml b/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml
index 3e62052c712780946251b284fb4ca2f58148fdfd..922fb16eefe61f562da5ac878cc427fe3fd02014 100644 (file)
--- a/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml
+++ b/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml
@@ -311,7 +311,12 @@
     </ajc-test>
     
     <ajc-test dir="bugs150/pr120474" pr="120474" title="Dollar classes">
-     <compile files="$Proxy4.java,X.aj"/>
+     <compile files="$Proxy4.java"/>
+     <compile files="X.aj" options="-outxml"/>
+     <run class="$Proxy4" ltw="aop.xml">
+        <stdout>
+        </stdout>
+     </run>
     </ajc-test>
         
     <ajc-test dir="bugs150/pr111667" pr="111667" title="lint for advice sorting">