Index: working_vm/vm/vmcore/src/kernel_classes/javasrc/java/lang/Thread.java =================================================================== --- working_vm/vm/vmcore/src/kernel_classes/javasrc/java/lang/Thread.java (revision 647500) +++ working_vm/vm/vmcore/src/kernel_classes/javasrc/java/lang/Thread.java (working copy) @@ -961,12 +961,18 @@ localValues.put(local, value); return value; } - if (localValues.containsKey(local)) { - return localValues.get(local); + value = localValues.get(local); + if (value != null) { + return value; + } else { + if (localValues.containsKey(local)) { + return null; + } else { + value = local.initialValue(); + localValues.put(local, value); + return value; + } } - value = local.initialValue(); - localValues.put(local, value); - return value; } /**