Fix for 91053 (Generics): Generics problem with Set

3 files changed, 27 insertions, 0 deletions

diff --git a/tests/java5/generics/bugs/PR91053.aj b/tests/java5/generics/bugs/PR91053.aj
new file mode 100644
index 000000000..75aa004a7
--- /dev/null
+++ b/tests/java5/generics/bugs/PR91053.aj
@@ -0,0 +1,18 @@
+import java.util.*;
+
+aspect X {
+
+    private Set PR91053.aSet = new HashSet();
+
+    public void PR91053.add(String s) {
+        aSet.add(s);
+    }
+
+}
+
+public class PR91053 { 
+
+  public static void main(String[]argv) {
+    new PR91053().add("hello");
+  }
+}
diff --git a/tests/src/org/aspectj/systemtest/ajc150/GenericsTests.java b/tests/src/org/aspectj/systemtest/ajc150/GenericsTests.java
index 96557dfe5..fe265050a 100644
--- a/tests/src/org/aspectj/systemtest/ajc150/GenericsTests.java
+++ b/tests/src/org/aspectj/systemtest/ajc150/GenericsTests.java
@@ -27,4 +27,8 @@ public class GenericsTests extends XMLBasedAjcTestCase {
 	public void testPR91267_2() {
 		runTest("NPE using generic methods in aspects 2");
 	}
+	
+	public void testPR91053() {
+		runTest("Generics problem with Set");
+	}
 }
diff --git a/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml b/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml
index 8dca8410f..e9ef342c3 100644
--- a/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml
+++ b/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml
@@ -2164,5 +2164,10 @@
         <compile files="TestBug2.aj" options="-1.5"/>
         <run class="TestBug2"/>
     </ajc-test>
+    
+    <ajc-test dir="java5/generics/bugs" title="Generics problem with Set" vm="1.5">
+      <compile files="PR91053.aj" options="-1.5"/>
+      <run class="PR91053"/>
+   </ajc-test>
  
 </suite>
\ No newline at end of file