aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libjava/ChangeLog6
-rw-r--r--libjava/java/lang/Thread.java13
2 files changed, 10 insertions, 9 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index f3ab963..0430779 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,9 @@
+2003-08-07 Bryce McKinlay <bryce@mckinlay.net.nz>
+
+ * java/lang/Thread.java (Thread): Check for null "name" from
+ start of private constructor, not after calling the private
+ constructor.
+
2003-08-06 Tom Tromey <tromey@redhat.com>
* java/io/FilePermission.java (equals): Use correct index for
diff --git a/libjava/java/lang/Thread.java b/libjava/java/lang/Thread.java
index 32f7d17..64498b2 100644
--- a/libjava/java/lang/Thread.java
+++ b/libjava/java/lang/Thread.java
@@ -614,11 +614,6 @@ public class Thread implements Runnable
public Thread (ThreadGroup g, Runnable r, String n)
{
this (currentThread (), g, r, n);
-
- // The Class Libraries book says ``threadName cannot be null''. I
- // take this to mean NullPointerException.
- if (n == null)
- throw new NullPointerException ();
}
/**
@@ -645,15 +640,15 @@ public class Thread implements Runnable
{
// Just ignore stackSize for now.
this (currentThread (), g, r, n);
+ }
+ private Thread (Thread current, ThreadGroup g, Runnable r, String n)
+ {
// The Class Libraries book says ``threadName cannot be null''. I
// take this to mean NullPointerException.
if (n == null)
throw new NullPointerException ();
- }
-
- private Thread (Thread current, ThreadGroup g, Runnable r, String n)
- {
+
if (g == null)
{
// If CURRENT is null, then we are bootstrapping the first thread.