8197531: Miscellaneous changes imported from jsr166 CVS 2018-04

Reviewed-by: martin, psandoz
This commit is contained in:
Doug Lea 2018-04-10 11:37:18 -07:00
parent a4f3a1d9eb
commit cdd36df363
27 changed files with 194 additions and 34 deletions

View file

@ -293,7 +293,7 @@ public class SynchronousQueue<E> extends AbstractQueue<E>
SMATCH = l.findVarHandle(SNode.class, "match", SNode.class);
SNEXT = l.findVarHandle(SNode.class, "next", SNode.class);
} catch (ReflectiveOperationException e) {
throw new Error(e);
throw new ExceptionInInitializerError(e);
}
}
}
@ -516,7 +516,7 @@ public class SynchronousQueue<E> extends AbstractQueue<E>
MethodHandles.Lookup l = MethodHandles.lookup();
SHEAD = l.findVarHandle(TransferStack.class, "head", SNode.class);
} catch (ReflectiveOperationException e) {
throw new Error(e);
throw new ExceptionInInitializerError(e);
}
}
}
@ -583,7 +583,7 @@ public class SynchronousQueue<E> extends AbstractQueue<E>
QITEM = l.findVarHandle(QNode.class, "item", Object.class);
QNEXT = l.findVarHandle(QNode.class, "next", QNode.class);
} catch (ReflectiveOperationException e) {
throw new Error(e);
throw new ExceptionInInitializerError(e);
}
}
}
@ -830,7 +830,7 @@ public class SynchronousQueue<E> extends AbstractQueue<E>
QCLEANME = l.findVarHandle(TransferQueue.class, "cleanMe",
QNode.class);
} catch (ReflectiveOperationException e) {
throw new Error(e);
throw new ExceptionInInitializerError(e);
}
}
}