aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormwebster <mwebster>2006-10-05 10:12:57 +0000
committermwebster <mwebster>2006-10-05 10:12:57 +0000
commit3ebee688f8dab9c114ca61b685b324c19640ae9b (patch)
treec7ef0fc748679370228bcb819c007ebeaa2bca02
parent81427c39398b2134bffa5485adc0defaee7db607 (diff)
downloadaspectj-3ebee688f8dab9c114ca61b685b324c19640ae9b.tar.gz
aspectj-3ebee688f8dab9c114ca61b685b324c19640ae9b.zip
Bug 158957 "NPE in LTW with RMI dynamic proxies w/ pointcut reuse" (ensure we can filter classes like $XXX)
-rw-r--r--tests/bugs150/pr120474/$Proxy4.java3
-rw-r--r--tests/bugs150/pr120474/X.aj4
-rw-r--r--tests/bugs150/pr120474/aop.xml5
-rw-r--r--tests/src/org/aspectj/systemtest/ajc150/ajc150.xml7
4 files changed, 17 insertions, 2 deletions
diff --git a/tests/bugs150/pr120474/$Proxy4.java b/tests/bugs150/pr120474/$Proxy4.java
index 3b617ca31..8da92d6c7 100644
--- 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 c0dd297e5..550028016 100644
--- 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
index 000000000..7032c15a9
--- /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 3e62052c7..922fb16ee 100644
--- 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">