diff options
Diffstat (limited to 'libjava/java/lang/Thread.java')
| -rw-r--r-- | libjava/java/lang/Thread.java | 30 |
1 files changed, 20 insertions, 10 deletions
diff --git a/libjava/java/lang/Thread.java b/libjava/java/lang/Thread.java index 3ee0309..33fabf4 100644 --- a/libjava/java/lang/Thread.java +++ b/libjava/java/lang/Thread.java @@ -145,15 +145,23 @@ public class Thread implements Runnable daemon_flag = status; } - // TODO12: - // public ClassLoader getContextClassLoader() - // { - // } + public ClassLoader getContextClassLoader() + { + if (context_class_loader == null) + { + context_class_loader = ClassLoader.getSystemClassLoader (); + return context_class_loader; + } + + // FIXME: Add security manager stuff here. + return context_class_loader; + } - // TODO12: - // public void setContextClassLoader(ClassLoader cl) - // { - // } + public void setContextClassLoader(ClassLoader cl) + { + // FIXME: Add security manager stuff here. + context_class_loader = cl; + } public final void setName (String n) { @@ -227,13 +235,14 @@ public class Thread implements Runnable interrupt_flag = false; alive_flag = false; startable_flag = true; - + if (current != null) { daemon_flag = current.isDaemon(); int gmax = group.getMaxPriority(); int pri = current.getPriority(); priority = (gmax < pri ? gmax : pri); + context_class_loader = current.context_class_loader; } else { @@ -277,7 +286,7 @@ public class Thread implements Runnable public String toString () { return "Thread[" + name + "," + priority + "," + - (group == null ? "" : group.getName()) + "]"; + (group == null ? "" : group.getName()) + "]"; } public static native void yield (); @@ -291,6 +300,7 @@ public class Thread implements Runnable boolean interrupt_flag; private boolean alive_flag; private boolean startable_flag; + private ClassLoader context_class_loader; // Our native data. private Object data; |