From f06a7b09252fecd08933bbc096027802224cab4e Mon Sep 17 00:00:00 2001 From: Stephan Herrmann Date: Sat, 4 Sep 2010 23:33:25 +0000 Subject: Test & fix for Bug 324526 - [reconciler] NPE during AST creation, team in role file subclassing non-team role And deploy JCLMin-updates into all relevant tests. --- othersrc/JCLMin1.5/src/java/lang/Boolean.java | 2 +- .../JCLMin1.5/src/java/lang/IllegalThreadStateException.java | 9 +++++++++ othersrc/JCLMin1.5/src/java/lang/Runnable.java | 5 +++++ othersrc/JCLMin1.5/src/java/lang/StringBuilder.java | 5 +++++ othersrc/JCLMin1.5/src/java/lang/Thread.java | 2 ++ othersrc/JCLMin1.5/src/java/lang/ThreadLocal.java | 2 +- othersrc/JCLMin1.5/src/java/util/HashSet.java | 5 +++++ othersrc/JCLMin1.5/src/java/util/WeakHashMap.java | 6 +++++- 8 files changed, 33 insertions(+), 3 deletions(-) create mode 100644 othersrc/JCLMin1.5/src/java/lang/IllegalThreadStateException.java create mode 100644 othersrc/JCLMin1.5/src/java/lang/Runnable.java create mode 100644 othersrc/JCLMin1.5/src/java/lang/StringBuilder.java create mode 100644 othersrc/JCLMin1.5/src/java/util/HashSet.java (limited to 'othersrc') diff --git a/othersrc/JCLMin1.5/src/java/lang/Boolean.java b/othersrc/JCLMin1.5/src/java/lang/Boolean.java index a83139621..b1dab7410 100644 --- a/othersrc/JCLMin1.5/src/java/lang/Boolean.java +++ b/othersrc/JCLMin1.5/src/java/lang/Boolean.java @@ -1,5 +1,5 @@ package java.lang; public class Boolean { - + public static Boolean TRUE = new Boolean(); } diff --git a/othersrc/JCLMin1.5/src/java/lang/IllegalThreadStateException.java b/othersrc/JCLMin1.5/src/java/lang/IllegalThreadStateException.java new file mode 100644 index 000000000..bca8ddc2b --- /dev/null +++ b/othersrc/JCLMin1.5/src/java/lang/IllegalThreadStateException.java @@ -0,0 +1,9 @@ +package java.lang; + +public class IllegalThreadStateException extends IllegalArgumentException { + + public IllegalThreadStateException(java.lang.String msg) { + super(msg); + } + +} diff --git a/othersrc/JCLMin1.5/src/java/lang/Runnable.java b/othersrc/JCLMin1.5/src/java/lang/Runnable.java new file mode 100644 index 000000000..7c2cc0f99 --- /dev/null +++ b/othersrc/JCLMin1.5/src/java/lang/Runnable.java @@ -0,0 +1,5 @@ +package java.lang; + +public interface Runnable { + +} diff --git a/othersrc/JCLMin1.5/src/java/lang/StringBuilder.java b/othersrc/JCLMin1.5/src/java/lang/StringBuilder.java new file mode 100644 index 000000000..3c2b27afe --- /dev/null +++ b/othersrc/JCLMin1.5/src/java/lang/StringBuilder.java @@ -0,0 +1,5 @@ +package java.lang; + +public class StringBuilder { + +} diff --git a/othersrc/JCLMin1.5/src/java/lang/Thread.java b/othersrc/JCLMin1.5/src/java/lang/Thread.java index 25c402564..fbe8a3d87 100644 --- a/othersrc/JCLMin1.5/src/java/lang/Thread.java +++ b/othersrc/JCLMin1.5/src/java/lang/Thread.java @@ -4,4 +4,6 @@ public class Thread implements Runnable { public void run() { } + public static Thread currentThread() { return null; } + public boolean isAlive() { return true; } } diff --git a/othersrc/JCLMin1.5/src/java/lang/ThreadLocal.java b/othersrc/JCLMin1.5/src/java/lang/ThreadLocal.java index d1f347945..0d69ac37b 100644 --- a/othersrc/JCLMin1.5/src/java/lang/ThreadLocal.java +++ b/othersrc/JCLMin1.5/src/java/lang/ThreadLocal.java @@ -1,5 +1,5 @@ package java.lang; public class ThreadLocal { - + protected synchronized T initialValue() { return null; } } diff --git a/othersrc/JCLMin1.5/src/java/util/HashSet.java b/othersrc/JCLMin1.5/src/java/util/HashSet.java new file mode 100644 index 000000000..01ac0330f --- /dev/null +++ b/othersrc/JCLMin1.5/src/java/util/HashSet.java @@ -0,0 +1,5 @@ +package java.util; + +public class HashSet { + +} diff --git a/othersrc/JCLMin1.5/src/java/util/WeakHashMap.java b/othersrc/JCLMin1.5/src/java/util/WeakHashMap.java index dc59d3fb2..a007d722b 100644 --- a/othersrc/JCLMin1.5/src/java/util/WeakHashMap.java +++ b/othersrc/JCLMin1.5/src/java/util/WeakHashMap.java @@ -1,5 +1,9 @@ package java.util; public class WeakHashMap extends AbstractMap { - + public V put(K k, V v) { return v; } + public void clear() {} + public boolean isEmpty() { return true; } + public boolean containsKey(V v) { return true; } + public V remove(Object o) { return null; } } -- cgit v1.2.3