Mercurial > hg > openjdk > jdk9 > jaxp
changeset 815:99557a0e377a
Merge
author | lana |
---|---|
date | Thu, 12 Nov 2015 14:14:24 -0800 |
parents | f665f69fa8e3 (current diff) 1528075e9d88 (diff) |
children | f868402f8d7b 1f9f972a1d86 |
files | |
diffstat | 1 files changed, 2 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/SafeThread.java Thu Nov 12 10:39:03 2015 -0800 +++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils/SafeThread.java Thu Nov 12 14:14:24 2015 -0800 @@ -24,8 +24,6 @@ */ package com.sun.org.apache.xml.internal.utils; -import sun.misc.Unsafe; - /** * This is a combination of ThreadControllerWrapper's inner class SafeThread * that was introduced as a fix for CR 6607339 @@ -35,7 +33,7 @@ */ public class SafeThread extends Thread { - private static final Unsafe UNSAFE; + private static final jdk.internal.misc.Unsafe UNSAFE; private static final long THREAD_LOCALS; private static final long INHERITABLE_THREAD_LOCALS; @@ -81,7 +79,7 @@ } static { - UNSAFE = Unsafe.getUnsafe(); + UNSAFE = jdk.internal.misc.Unsafe.getUnsafe(); Class<?> t = Thread.class; try { THREAD_LOCALS = UNSAFE.objectFieldOffset(t.getDeclaredField("threadLocals"));