test for 114343 (see comment #5): another potential case

3 files changed, 68 insertions, 0 deletions

diff --git a/tests/bugs150/pr114343/case3/TTT.java b/tests/bugs150/pr114343/case3/TTT.java
new file mode 100644
index 000000000..c822a1cbb
--- /dev/null
+++ b/tests/bugs150/pr114343/case3/TTT.java
@@ -0,0 +1,20 @@
+import java.util.*;
+
+public class TTT {
+  public void foo() {
+    System.err.println("Creating Test<Integer> instance");
+    Test<Integer> mt = new Test<Integer>();
+    System.err.println("Calling toArray");
+    Integer[] arr = mt.toArray(new Integer[]{});
+    System.err.println("done");
+  }
+
+  public Integer getFirst() {
+    System.err.println("Creating Test<Integer> instance");
+    Test<Integer> mt = new Test<Integer>();
+    System.err.println("Calling getFirst");
+    Integer i = mt.getFirst();
+    System.err.println("done");
+    return i;
+  }
+}
diff --git a/tests/bugs150/pr114343/case3/Test.java b/tests/bugs150/pr114343/case3/Test.java
new file mode 100644
index 000000000..2634cd915
--- /dev/null
+++ b/tests/bugs150/pr114343/case3/Test.java
@@ -0,0 +1,16 @@
+import java.util.*;
+
+public class Test<T extends Number> {
+
+  Set<T> set = new HashSet<T>();
+  T t = null;
+
+  public <T> T[] toArray(T[] a) {
+    System.err.println("In toArray()");
+    return set.toArray(a);
+  }
+
+  public T getFirst() {
+    return t;
+  }
+}
diff --git a/tests/bugs150/pr114343/case3/TestAspect.java b/tests/bugs150/pr114343/case3/TestAspect.java
new file mode 100644
index 000000000..6d82c0f0e
--- /dev/null
+++ b/tests/bugs150/pr114343/case3/TestAspect.java
@@ -0,0 +1,32 @@
+import java.util.*;
+
+public privileged aspect TestAspect {
+
+  pointcut TestToArray(Test mt) : target(mt) && !within(TestAspect);
+
+  pointcut getFirstExec(Test mt) :
+    execution(* getFirst(..)) && target(mt) && !within(TestAspect);
+
+
+  Object[] around(Test mt, Object[] objs) :
+    TestToArray(mt) && args(objs) &&
+    execution(Object[] Test.toArray(Object[])) {
+
+    System.err.println("In around advice");
+    objs = proceed(mt, objs);
+    return objs;
+  }
+
+  Object around(Test mt): getFirstExec(mt) {
+    System.err.println("around on getFirstExec(): running");
+    return proceed(mt);
+  }
+
+
+  public static void main(String[] argv) {
+     System.err.println("TestAspect.main: Calling foo");
+     new TTT().foo();   
+     Object o = new TTT().getFirst();   
+     System.err.println("TestAspect.main: done");
+  }
+}