From fc750075fd91edcdd5e73cf04593ea3c822a746a Mon Sep 17 00:00:00 2001
From: mwebster <mwebster>
Date: Mon, 16 Oct 2006 13:23:43 +0000
Subject: [PATCH] Bug 158957 "NPE in LTW with RMI dynamic proxies w/ pointcut
 reuse" (give modified testcase for 120474 a unique name to avoid intermittent
 failures when running the whole suite)

---
 tests/bugs150/pr120474/{$Proxy4.java => $ProxyPr120474.java} | 4 ++--
 tests/src/org/aspectj/systemtest/ajc150/ajc150.xml           | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename tests/bugs150/pr120474/{$Proxy4.java => $ProxyPr120474.java} (54%)

diff --git a/tests/bugs150/pr120474/$Proxy4.java b/tests/bugs150/pr120474/$ProxyPr120474.java
similarity index 54%
rename from tests/bugs150/pr120474/$Proxy4.java
rename to tests/bugs150/pr120474/$ProxyPr120474.java
index 8da92d6c7..0556d9821 100644
--- a/tests/bugs150/pr120474/$Proxy4.java
+++ b/tests/bugs150/pr120474/$ProxyPr120474.java
@@ -1,6 +1,6 @@
-public class $Proxy4 {
+public class $ProxyPr120474 {
   public void foo() {}
   public static void main (String[] args) {
-	  new $Proxy4().foo();
+	  new $ProxyPr120474().foo();
   }
 }
diff --git a/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml b/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml
index 43e304401..503eccbe8 100644
--- a/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml
+++ b/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml
@@ -311,9 +311,9 @@
     </ajc-test>
     
     <ajc-test dir="bugs150/pr120474" pr="120474" title="Dollar classes">
-     <compile files="$Proxy4.java"/>
+     <compile files="$ProxyPr120474.java"/>
      <compile files="X.aj" options="-outxml"/>
-     <run class="$Proxy4" ltw="aop.xml">
+     <run class="$ProxyPr120474" ltw="aop.xml">
         <stdout>
         </stdout>
      </run>
-- 
2.39.5