223226: test and fix for NPE and duplicate signature

6 files changed, 26 insertions, 0 deletions

diff --git a/tests/bugs161/pr223226/AspectX.java b/tests/bugs161/pr223226/AspectX.java
new file mode 100644
index 000000000..76fa159d9
--- /dev/null
+++ b/tests/bugs161/pr223226/AspectX.java
@@ -0,0 +1,4 @@
+public aspect AspectX
+{
+        public A AspectXMarker<A,B>.doSomething(B b) { return null; }
+}
diff --git a/tests/bugs161/pr223226/AspectXMarker.java b/tests/bugs161/pr223226/AspectXMarker.java
new file mode 100644
index 000000000..f880df472
--- /dev/null
+++ b/tests/bugs161/pr223226/AspectXMarker.java
@@ -0,0 +1,3 @@
+public interface AspectXMarker <A, B extends BInterface<?> > extends   
+FooInterface<A, B>
+{ }
diff --git a/tests/bugs161/pr223226/BInterface.java b/tests/bugs161/pr223226/BInterface.java
new file mode 100644
index 000000000..790d4967c
--- /dev/null
+++ b/tests/bugs161/pr223226/BInterface.java
@@ -0,0 +1,2 @@
+public interface BInterface<S> { }
+
diff --git a/tests/bugs161/pr223226/Foo.java b/tests/bugs161/pr223226/Foo.java
new file mode 100644
index 000000000..4aaa0fb1a
--- /dev/null
+++ b/tests/bugs161/pr223226/Foo.java
@@ -0,0 +1,3 @@
+public class Foo<B extends BInterface<?>> implements AspectXMarker<Integer, B>
+{}
+
diff --git a/tests/bugs161/pr223226/FooInterface.java b/tests/bugs161/pr223226/FooInterface.java
new file mode 100644
index 000000000..e4884ba47
--- /dev/null
+++ b/tests/bugs161/pr223226/FooInterface.java
@@ -0,0 +1,5 @@
+public interface FooInterface<A,B>
+{
+        public A doSomething(B transition);
+}
+
diff --git a/tests/bugs161/pr223226/Test.java b/tests/bugs161/pr223226/Test.java
new file mode 100644
index 000000000..354916dcb
--- /dev/null
+++ b/tests/bugs161/pr223226/Test.java
@@ -0,0 +1,9 @@
+public class Test 
+{
+        public static void main(String[] args)
+        {
+                Foo<BInterface<Integer>> foo = new Foo<BInterface<Integer>>();
+
+                foo.doSomething(null);
+        }
+}