diff options
author | Android (Google) Code Review <android-gerrit@google.com> | 2009-06-16 16:43:21 -0700 |
---|---|---|
committer | The Android Open Source Project <initial-contribution@android.com> | 2009-06-16 16:43:21 -0700 |
commit | c9369d3ae1804cf2206ab5e1d98e153c798ac143 (patch) | |
tree | 539e252e3dd6de823213698034fb6beb99b5fccb /luni-kernel/src | |
parent | 2213fde5a59f7e6cdcfa506bb1719a14b2e3b3ff (diff) | |
parent | 0458cf2e38bce6112f3165b71846c445c1d08ccc (diff) | |
download | libcore-c9369d3ae1804cf2206ab5e1d98e153c798ac143.zip libcore-c9369d3ae1804cf2206ab5e1d98e153c798ac143.tar.gz libcore-c9369d3ae1804cf2206ab5e1d98e153c798ac143.tar.bz2 |
am 5f9aa938: Merge change 4334 into donut
Merge commit '5f9aa93881e796a66c2a625ced1ee89292c2b570'
* commit '5f9aa93881e796a66c2a625ced1ee89292c2b570':
Modified Thread to copy the context class loader from parent to child threads. Re-enabled test that covers this. Removed security-related code from test since it was invalid (the security check
Diffstat (limited to 'luni-kernel/src')
-rw-r--r-- | luni-kernel/src/main/java/java/lang/Thread.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/luni-kernel/src/main/java/java/lang/Thread.java b/luni-kernel/src/main/java/java/lang/Thread.java index d3795f8..3cde7e1 100644 --- a/luni-kernel/src/main/java/java/lang/Thread.java +++ b/luni-kernel/src/main/java/java/lang/Thread.java @@ -508,6 +508,8 @@ public class Thread implements Runnable { this.priority = currentThread.getPriority(); + this.contextClassLoader = currentThread.contextClassLoader; + // Transfer over InheritableThreadLocals. if (currentThread.inheritableValues != null) { inheritableValues |