infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-02-27 02:30:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Sean Mullan 2015-11-12 16:09:09 -05:00
commit 4591a2d447
137 changed files with 488 additions and 200 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jdk/make/src/classes/build/tools/x11wrappergen/WrapperGenerator.java
View File

@ -841,7 +841,7 @@ public class WrapperGenerator {
pw.println("// This file is an automatically generated file, please do not edit this file, modify the WrapperGenerator.java file instead !\n" );
pw.println("package "+package_name+";\n");
pw.println("import sun.misc.*;\n");
pw.println("import jdk.internal.misc.Unsafe;\n");
pw.println("import sun.util.logging.PlatformLogger;");
String baseClass = stp.getBaseClass();
if (baseClass == null) {
@ -941,7 +941,7 @@ public class WrapperGenerator {
pw.println("// This file is an automatically generated file, please do not edit this file, modify the WrapperGenerator.java file instead !\n" );
pw.println("package "+package_name+";\n");
pw.println("import sun.misc.Unsafe;\n");
pw.println("import jdk.internal.misc.Unsafe;\n");
pw.println("class " + ft.getName() + " {");
pw.println("\tprivate static Unsafe unsafe = XlibWrapper.unsafe;");
pw.println("\tprivate boolean __executed = false;");

2
jdk/src/java.base/aix/classes/sun/nio/ch/AixPollPort.java
View File

@ -34,7 +34,7 @@ import java.util.concurrent.ArrayBlockingQueue;
import java.util.concurrent.RejectedExecutionException;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.locks.ReentrantLock;
import sun.misc.Unsafe;
import jdk.internal.misc.Unsafe;
/**
* AsynchronousChannelGroup implementation based on the AIX pollset framework.

2
jdk/src/java.base/linux/classes/sun/nio/ch/EPoll.java
View File

@ -26,7 +26,7 @@
package sun.nio.ch;
import java.io.IOException;
import sun.misc.Unsafe;
import jdk.internal.misc.Unsafe;
/**
* Provides access to the Linux epoll facility.

2
jdk/src/java.base/linux/classes/sun/nio/fs/LinuxDosFileAttributeView.java
View File

@ -29,7 +29,7 @@ import java.nio.file.attribute.*;
import java.util.Map;
import java.util.Set;
import java.io.IOException;
import sun.misc.Unsafe;
import jdk.internal.misc.Unsafe;
import static sun.nio.fs.UnixNativeDispatcher.*;
import static sun.nio.fs.UnixConstants.*;

2
jdk/src/java.base/linux/classes/sun/nio/fs/LinuxUserDefinedFileAttributeView.java
View File

@ -29,7 +29,7 @@ import java.nio.file.*;
import java.nio.ByteBuffer;
import java.io.IOException;
import java.util.*;
import sun.misc.Unsafe;
import jdk.internal.misc.Unsafe;
import static sun.nio.fs.UnixConstants.*;
import static sun.nio.fs.LinuxNativeDispatcher.*;

2
jdk/src/java.base/linux/classes/sun/nio/fs/LinuxWatchService.java
View File

@ -30,7 +30,7 @@ import java.security.AccessController;
import java.security.PrivilegedAction;
import java.util.*;
import java.io.IOException;
import sun.misc.Unsafe;
import jdk.internal.misc.Unsafe;
import static sun.nio.fs.UnixNativeDispatcher.*;
import static sun.nio.fs.UnixConstants.*;

2
jdk/src/java.base/macosx/classes/sun/nio/ch/KQueue.java
View File

@ -26,7 +26,7 @@
package sun.nio.ch;
import java.io.IOException;
import sun.misc.Unsafe;
import jdk.internal.misc.Unsafe;
/**
* Provides access to the BSD kqueue facility.

4
jdk/src/java.base/share/classes/java/io/File.java
View File

@ -2184,10 +2184,10 @@ public class File
private static final long PATH_OFFSET;
private static final long PREFIX_LENGTH_OFFSET;
private static final sun.misc.Unsafe UNSAFE;
private static final jdk.internal.misc.Unsafe UNSAFE;
static {
try {
sun.misc.Unsafe unsafe = sun.misc.Unsafe.getUnsafe();
jdk.internal.misc.Unsafe unsafe = jdk.internal.misc.Unsafe.getUnsafe();
PATH_OFFSET = unsafe.objectFieldOffset(
File.class.getDeclaredField("path"));
PREFIX_LENGTH_OFFSET = unsafe.objectFieldOffset(

2
jdk/src/java.base/share/classes/java/io/ObjectInputStream.java
View File

@ -40,7 +40,7 @@ import java.util.HashMap;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import static java.io.ObjectStreamClass.processQueue;
import sun.misc.Unsafe;
import jdk.internal.misc.Unsafe;
import sun.reflect.misc.ReflectUtil;
/**

2
jdk/src/java.base/share/classes/java/io/ObjectStreamClass.java
View File

@ -48,7 +48,7 @@ import java.util.HashSet;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import sun.misc.Unsafe;
import jdk.internal.misc.Unsafe;
import sun.reflect.CallerSensitive;
import sun.reflect.Reflection;
import sun.reflect.ReflectionFactory;

2
jdk/src/java.base/share/classes/java/lang/Class.java
View File

@ -55,7 +55,7 @@ import java.util.Map;
import java.util.HashMap;
import java.util.Objects;
import java.util.StringJoiner;
import sun.misc.Unsafe;
import jdk.internal.misc.Unsafe;
import jdk.internal.HotSpotIntrinsicCandidate;
import sun.reflect.CallerSensitive;
import sun.reflect.ConstantPool;

2
jdk/src/java.base/share/classes/java/lang/invoke/DirectMethodHandle.java
View File

@ -25,7 +25,7 @@
package java.lang.invoke;
import sun.misc.Unsafe;
import jdk.internal.misc.Unsafe;
import java.lang.reflect.Method;
import java.util.Arrays;
import sun.invoke.util.VerifyAccess;

2
jdk/src/java.base/share/classes/java/lang/invoke/InnerClassLambdaMetafactory.java
View File

@ -27,7 +27,7 @@ package java.lang.invoke;
import jdk.internal.org.objectweb.asm.*;
import sun.invoke.util.BytecodeDescriptor;
import sun.misc.Unsafe;
import jdk.internal.misc.Unsafe;
import sun.security.action.GetPropertyAction;
import java.io.FilePermission;

2
jdk/src/java.base/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java
View File

@ -775,7 +775,7 @@ class InvokerBytecodeGenerator {
// Sample classes from each package we are willing to bind to statically:
java.lang.Object.class,
java.util.Arrays.class,
sun.misc.Unsafe.class
jdk.internal.misc.Unsafe.class
//MethodHandle.class already covered
};

2
jdk/src/java.base/share/classes/java/lang/invoke/MethodHandleNatives.java
View File

@ -50,7 +50,7 @@ class MethodHandleNatives {
static native int getMembers(Class<?> defc, String matchName, String matchSig,
int matchFlags, Class<?> caller, int skip, MemberName[] results);
/// Field layout queries parallel to sun.misc.Unsafe:
/// Field layout queries parallel to jdk.internal.misc.Unsafe:
static native long objectFieldOffset(MemberName self); // e.g., returns vmindex
static native long staticFieldOffset(MemberName self); // e.g., returns vmindex
static native Object staticFieldBase(MemberName self); // e.g., returns clazz

2
jdk/src/java.base/share/classes/java/lang/invoke/MethodHandleStatics.java
View File

@ -27,7 +27,7 @@ package java.lang.invoke;
import java.security.AccessController;
import java.security.PrivilegedAction;
import sun.misc.Unsafe;
import jdk.internal.misc.Unsafe;
/**
* This class consists exclusively of static names internal to the

4
jdk/src/java.base/share/classes/java/math/BigDecimal.java
View File

@ -3726,12 +3726,12 @@ public class BigDecimal extends Number implements Comparable<BigDecimal> {
}
private static class UnsafeHolder {
private static final sun.misc.Unsafe unsafe;
private static final jdk.internal.misc.Unsafe unsafe;
private static final long intCompactOffset;
private static final long intValOffset;
static {
try {
unsafe = sun.misc.Unsafe.getUnsafe();
unsafe = jdk.internal.misc.Unsafe.getUnsafe();
intCompactOffset = unsafe.objectFieldOffset
(BigDecimal.class.getDeclaredField("intCompact"));
intValOffset = unsafe.objectFieldOffset

4
jdk/src/java.base/share/classes/java/math/BigInteger.java
View File

@ -4526,12 +4526,12 @@ public class BigInteger extends Number implements Comparable<BigInteger> {
// Support for resetting final fields while deserializing
private static class UnsafeHolder {
private static final sun.misc.Unsafe unsafe;
private static final jdk.internal.misc.Unsafe unsafe;
private static final long signumOffset;
private static final long magOffset;
static {
try {
unsafe = sun.misc.Unsafe.getUnsafe();
unsafe = jdk.internal.misc.Unsafe.getUnsafe();
signumOffset = unsafe.objectFieldOffset
(BigInteger.class.getDeclaredField("signum"));
magOffset = unsafe.objectFieldOffset

4
jdk/src/java.base/share/classes/java/net/Inet6Address.java
View File

@ -576,11 +576,11 @@ class Inet6Address extends InetAddress {
};
private static final long FIELDS_OFFSET;
private static final sun.misc.Unsafe UNSAFE;
private static final jdk.internal.misc.Unsafe UNSAFE;
static {
try {
sun.misc.Unsafe unsafe = sun.misc.Unsafe.getUnsafe();
jdk.internal.misc.Unsafe unsafe = jdk.internal.misc.Unsafe.getUnsafe();
FIELDS_OFFSET = unsafe.objectFieldOffset(
Inet6Address.class.getDeclaredField("holder6"));
UNSAFE = unsafe;

7
jdk/src/java.base/share/classes/java/net/InetAddress.java
View File

@ -29,6 +29,7 @@ import java.util.NavigableSet;
import java.util.Iterator;
import java.util.List;
import java.util.ArrayList;
import java.util.Objects;
import java.util.ServiceLoader;
import java.security.AccessController;
import java.io.ObjectStreamException;
@ -733,7 +734,7 @@ class InetAddress implements java.io.Serializable {
*/
public String toString() {
String hostName = holder().getHostName();
return ((hostName != null) ? hostName : "")
return Objects.toString(hostName, "")
+ "/" + getHostAddress();
}
@ -1493,11 +1494,11 @@ class InetAddress implements java.io.Serializable {
}
private static final long FIELDS_OFFSET;
private static final sun.misc.Unsafe UNSAFE;
private static final jdk.internal.misc.Unsafe UNSAFE;
static {
try {
sun.misc.Unsafe unsafe = sun.misc.Unsafe.getUnsafe();
jdk.internal.misc.Unsafe unsafe = jdk.internal.misc.Unsafe.getUnsafe();
FIELDS_OFFSET = unsafe.objectFieldOffset(
InetAddress.class.getDeclaredField("holder")
);

4
jdk/src/java.base/share/classes/java/net/InetSocketAddress.java
View File

@ -303,10 +303,10 @@ public class InetSocketAddress
}
private static final long FIELDS_OFFSET;
private static final sun.misc.Unsafe UNSAFE;
private static final jdk.internal.misc.Unsafe UNSAFE;
static {
try {
sun.misc.Unsafe unsafe = sun.misc.Unsafe.getUnsafe();
jdk.internal.misc.Unsafe unsafe = jdk.internal.misc.Unsafe.getUnsafe();
FIELDS_OFFSET = unsafe.objectFieldOffset(
InetSocketAddress.class.getDeclaredField("holder"));
UNSAFE = unsafe;

18
jdk/src/java.base/share/classes/java/net/SocketOptions.java
View File

@ -61,21 +61,21 @@ public interface SocketOptions {
* If the requested option is binary, it can be set using this method by
* a java.lang.Boolean:
* <BR><PRE>
* s.setOption(TCP_NODELAY, new Boolean(true));
* s.setOption(TCP_NODELAY, Boolean.TRUE);
* // OK - enables TCP_NODELAY, a binary option
* </PRE>
* <BR>
* Any option can be disabled using this method with a Boolean(false):
* Any option can be disabled using this method with a Boolean.FALSE:
* <BR><PRE>
* s.setOption(TCP_NODELAY, new Boolean(false));
* s.setOption(TCP_NODELAY, Boolean.FALSE);
* // OK - disables TCP_NODELAY
* s.setOption(SO_LINGER, new Boolean(false));
* s.setOption(SO_LINGER, Boolean.FALSE);
* // OK - disables SO_LINGER
* </PRE>
* <BR>
* For an option that has a notion of on and off, and requires
* a non-boolean parameter, setting its value to anything other than
* <I>Boolean(false)</I> implicitly enables it.
* <I>Boolean.FALSE</I> implicitly enables it.
* <BR>
* Throws SocketException if the option is unrecognized,
* the socket is closed, or some low-level error occurred
@ -91,8 +91,8 @@ public interface SocketOptions {
/**
* Fetch the value of an option.
* Binary options will return java.lang.Boolean(true)
* if enabled, java.lang.Boolean(false) if disabled, e.g.:
* Binary options will return java.lang.Boolean.TRUE
* if enabled, java.lang.Boolean.FALSE if disabled, e.g.:
* <BR><PRE>
* SocketImpl s;
* ...
@ -105,13 +105,13 @@ public interface SocketOptions {
* <P>
* For options that take a particular type as a parameter,
* getOption(int) will return the parameter's value, else
* it will return java.lang.Boolean(false):
* it will return java.lang.Boolean.FALSE:
* <PRE>
* Object o = s.getOption(SO_LINGER);
* if (o instanceof Integer) {
* System.out.print("Linger time is " + ((Integer)o).intValue());
* } else {
* // the true type of o is java.lang.Boolean(false);
* // the true type of o is java.lang.Boolean.FALSE;
* }
* </PRE>
*

5
jdk/src/java.base/share/classes/java/net/URLConnection.java
View File

@ -32,6 +32,7 @@ import java.security.PrivilegedAction;
import java.util.Hashtable;
import java.util.Date;
import java.util.Iterator;
import java.util.Objects;
import java.util.ServiceConfigurationError;
import java.util.ServiceLoader;
import java.util.StringTokenizer;
@ -1250,7 +1251,7 @@ public abstract class URLConnection {
if (handler != null) {
ContentHandler h = handlers.putIfAbsent(contentType, handler);
return h != null ? h : handler;
return Objects.requireNonNullElse(h, handler);
}
try {
@ -1263,7 +1264,7 @@ public abstract class URLConnection {
assert handler != null;
ContentHandler h = handlers.putIfAbsent(contentType, handler);
return h != null ? h : handler;
return Objects.requireNonNullElse(h, handler);
}
/*

2
jdk/src/java.base/share/classes/java/nio/MappedByteBuffer.java
View File

@ -26,7 +26,7 @@
package java.nio;
import java.io.FileDescriptor;
import sun.misc.Unsafe;
import jdk.internal.misc.Unsafe;
/**

4
jdk/src/java.base/share/classes/java/nio/charset/Charset.java
View File

@ -37,6 +37,7 @@ import java.util.Iterator;
import java.util.Locale;
import java.util.Map;
import java.util.NoSuchElementException;
import java.util.Objects;
import java.util.Set;
import java.util.ServiceLoader;
import java.util.ServiceConfigurationError;
@ -625,6 +626,7 @@ public abstract class Charset
private final String name; // tickles a bug in oldjavac
private final String[] aliases; // tickles a bug in oldjavac
private final String[] zeroAliases = new String[0];
private Set<String> aliasSet = null;
/**
@ -642,7 +644,7 @@ public abstract class Charset
*/
protected Charset(String canonicalName, String[] aliases) {
checkName(canonicalName);
String[] as = (aliases == null) ? new String[0] : aliases;
String[] as = Objects.requireNonNullElse(aliases, zeroAliases);
for (int i = 0; i < as.length; i++)
checkName(as[i]);
this.name = canonicalName;

2
jdk/src/java.base/share/classes/java/security/SecureRandom.java
View File

@ -419,7 +419,7 @@ public class SecureRandom extends java.util.Random {
* @since 1.5
*/
public String getAlgorithm() {
return (algorithm != null) ? algorithm : "unknown";
return Objects.toString(algorithm, "unknown");
}
/**

3
jdk/src/java.base/share/classes/java/time/ZoneId.java
View File

@ -310,8 +310,7 @@ public abstract class ZoneId implements Serializable {
public static ZoneId of(String zoneId, Map<String, String> aliasMap) {
Objects.requireNonNull(zoneId, "zoneId");
Objects.requireNonNull(aliasMap, "aliasMap");
String id = aliasMap.get(zoneId);
id = (id != null ? id : zoneId);
String id = Objects.requireNonNullElse(aliasMap.get(zoneId), zoneId);
return of(id);
}

2
jdk/src/java.base/share/classes/java/time/chrono/Chronology.java
View File

@ -177,7 +177,7 @@ public interface Chronology extends Comparable<Chronology> {
static Chronology from(TemporalAccessor temporal) {
Objects.requireNonNull(temporal, "temporal");
Chronology obj = temporal.query(TemporalQueries.chronology());
return (obj != null ? obj : IsoChronology.INSTANCE);
return Objects.requireNonNullElse(obj, IsoChronology.INSTANCE);
}
//-----------------------------------------------------------------------

9
jdk/src/java.base/share/classes/java/time/format/DateTimeFormatterBuilder.java
View File

@ -2892,7 +2892,8 @@ public final class DateTimeFormatterBuilder {
@Override
public String toString() {
return "ReducedValue(" + field + "," + minWidth + "," + maxWidth + "," + (baseDate != null ? baseDate : baseValue) + ")";
return "ReducedValue(" + field + "," + minWidth + "," + maxWidth +
"," + Objects.requireNonNullElse(baseDate, baseValue) + ")";
}
}
@ -3851,6 +3852,10 @@ public final class DateTimeFormatterBuilder {
return parseOffsetBased(context, text, position, position + 2, OffsetIdPrinterParser.INSTANCE_ID_ZERO);
} else if (context.charEquals(nextChar, 'G') && length >= position + 3 &&
context.charEquals(nextNextChar, 'M') && context.charEquals(text.charAt(position + 2), 'T')) {
if (length >= position + 4 && context.charEquals(text.charAt(position + 3), '0')) {
context.setParsed(ZoneId.of("GMT0"));
return position + 4;
}
return parseOffsetBased(context, text, position, position + 3, OffsetIdPrinterParser.INSTANCE_ID_ZERO);
}
}
@ -4328,7 +4333,7 @@ public final class DateTimeFormatterBuilder {
private String getChronologyName(Chronology chrono, Locale locale) {
String key = "calendarname." + chrono.getCalendarType();
String name = DateTimeTextProvider.getLocalizedResource(key, locale);
return name != null ? name : chrono.getId();
return Objects.requireNonNullElseGet(name, () -> chrono.getId());
}
}

2
jdk/src/java.base/share/classes/java/time/format/DateTimePrintContext.java
View File

@ -146,7 +146,7 @@ final class DateTimePrintContext {
if (overrideZone != null) {
// if have zone and instant, calculation is simple, defaulting chrono if necessary
if (temporal.isSupported(INSTANT_SECONDS)) {
Chronology chrono = (effectiveChrono != null ? effectiveChrono : IsoChronology.INSTANCE);
Chronology chrono = Objects.requireNonNullElse(effectiveChrono, IsoChronology.INSTANCE);
return chrono.zonedDateTime(Instant.from(temporal), overrideZone);
}
// block changing zone on OffsetTime, and similar problem cases

13
jdk/src/java.base/share/classes/java/time/temporal/IsoFields.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -102,7 +102,7 @@ import sun.util.locale.provider.LocaleResources;
* The complete date is expressed using three fields:
* <ul>
* <li>{@link #DAY_OF_QUARTER DAY_OF_QUARTER} - the day within the quarter, from 1 to 90, 91 or 92
* <li>{@link #QUARTER_OF_YEAR QUARTER_OF_YEAR} - the week within the week-based-year
* <li>{@link #QUARTER_OF_YEAR QUARTER_OF_YEAR} - the quarter within the year, from 1 to 4
* <li>{@link ChronoField#YEAR YEAR} - the standard ISO year
* </ul>
*
@ -571,9 +571,6 @@ public final class IsoFields {
//-------------------------------------------------------------------------
private static final int[] QUARTER_DAYS = {0, 90, 181, 273, 0, 91, 182, 274};
private static boolean isIso(TemporalAccessor temporal) {
return Chronology.from(temporal).equals(IsoChronology.INSTANCE);
}
private static void ensureIso(TemporalAccessor temporal) {
if (isIso(temporal) == false) {
@ -681,7 +678,7 @@ public final class IsoFields {
@Override
public boolean isSupportedBy(Temporal temporal) {
return temporal.isSupported(EPOCH_DAY);
return temporal.isSupported(EPOCH_DAY) && isIso(temporal);
}
@SuppressWarnings("unchecked")
@ -721,4 +718,8 @@ public final class IsoFields {
return name;
}
}
static boolean isIso(TemporalAccessor temporal) {
return Chronology.from(temporal).equals(IsoChronology.INSTANCE);
}
}

21
jdk/src/java.base/share/classes/java/util/Formatter.java
View File

@ -49,6 +49,7 @@ import java.text.DecimalFormatSymbols;
import java.text.NumberFormat;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.Objects;
import java.time.DateTimeException;
import java.time.Instant;
@ -3860,7 +3861,7 @@ public final class Formatter implements Closeable, Flushable {
ampm = dfs.getAmPmStrings();
}
String s = ampm[t.get(Calendar.AM_PM)];
sb.append(s.toLowerCase(l != null ? l : Locale.US));
sb.append(s.toLowerCase(Objects.requireNonNullElse(l, Locale.US)));
break;
}
case DateTime.SECONDS_SINCE_EPOCH: { // 's' (0 - 99...?)
@ -3893,7 +3894,7 @@ public final class Formatter implements Closeable, Flushable {
TimeZone tz = t.getTimeZone();
sb.append(tz.getDisplayName((t.get(Calendar.DST_OFFSET) != 0),
TimeZone.SHORT,
(l == null) ? Locale.US : l));
Objects.requireNonNullElse(l, Locale.US)));
break;
}
@ -3901,7 +3902,7 @@ public final class Formatter implements Closeable, Flushable {
case DateTime.NAME_OF_DAY_ABBREV: // 'a'
case DateTime.NAME_OF_DAY: { // 'A'
int i = t.get(Calendar.DAY_OF_WEEK);
Locale lt = ((l == null) ? Locale.US : l);
Locale lt = Objects.requireNonNullElse(l, Locale.US);
DateFormatSymbols dfs = DateFormatSymbols.getInstance(lt);
if (c == DateTime.NAME_OF_DAY)
sb.append(dfs.getWeekdays()[i]);
@ -3913,7 +3914,7 @@ public final class Formatter implements Closeable, Flushable {
case DateTime.NAME_OF_MONTH_ABBREV_X: // 'h' -- same b
case DateTime.NAME_OF_MONTH: { // 'B'
int i = t.get(Calendar.MONTH);
Locale lt = ((l == null) ? Locale.US : l);
Locale lt = Objects.requireNonNullElse(l, Locale.US);
DateFormatSymbols dfs = DateFormatSymbols.getInstance(lt);
if (c == DateTime.NAME_OF_MONTH)
sb.append(dfs.getMonths()[i]);
@ -3984,7 +3985,7 @@ public final class Formatter implements Closeable, Flushable {
StringBuilder tsb = new StringBuilder();
print(tsb, t, DateTime.AM_PM, l);
sb.append(tsb.toString().toUpperCase(l != null ? l : Locale.US));
sb.append(tsb.toString().toUpperCase(Objects.requireNonNullElse(l, Locale.US)));
break;
}
case DateTime.DATE_TIME: { // 'c' (Sat Nov 04 12:02:33 EST 1999)
@ -4092,7 +4093,7 @@ public final class Formatter implements Closeable, Flushable {
ampm = dfs.getAmPmStrings();
}
String s = ampm[t.get(ChronoField.AMPM_OF_DAY)];
sb.append(s.toLowerCase(l != null ? l : Locale.US));
sb.append(s.toLowerCase(Objects.requireNonNullElse(l, Locale.US)));
break;
}
case DateTime.SECONDS_SINCE_EPOCH: { // 's' (0 - 99...?)
@ -4131,7 +4132,7 @@ public final class Formatter implements Closeable, Flushable {
sb.append(TimeZone.getTimeZone(zid.getId())
.getDisplayName(zid.getRules().isDaylightSavings(instant),
TimeZone.SHORT,
(l == null) ? Locale.US : l));
Objects.requireNonNullElse(l, Locale.US)));
break;
}
sb.append(zid.getId());
@ -4141,7 +4142,7 @@ public final class Formatter implements Closeable, Flushable {
case DateTime.NAME_OF_DAY_ABBREV: // 'a'
case DateTime.NAME_OF_DAY: { // 'A'
int i = t.get(ChronoField.DAY_OF_WEEK) % 7 + 1;
Locale lt = ((l == null) ? Locale.US : l);
Locale lt = Objects.requireNonNullElse(l, Locale.US);
DateFormatSymbols dfs = DateFormatSymbols.getInstance(lt);
if (c == DateTime.NAME_OF_DAY)
sb.append(dfs.getWeekdays()[i]);
@ -4153,7 +4154,7 @@ public final class Formatter implements Closeable, Flushable {
case DateTime.NAME_OF_MONTH_ABBREV_X: // 'h' -- same b
case DateTime.NAME_OF_MONTH: { // 'B'
int i = t.get(ChronoField.MONTH_OF_YEAR) - 1;
Locale lt = ((l == null) ? Locale.US : l);
Locale lt = Objects.requireNonNullElse(l, Locale.US);
DateFormatSymbols dfs = DateFormatSymbols.getInstance(lt);
if (c == DateTime.NAME_OF_MONTH)
sb.append(dfs.getMonths()[i]);
@ -4223,7 +4224,7 @@ public final class Formatter implements Closeable, Flushable {
// this may be in wrong place for some locales
StringBuilder tsb = new StringBuilder();
print(tsb, t, DateTime.AM_PM, l);
sb.append(tsb.toString().toUpperCase(l != null ? l : Locale.US));
sb.append(tsb.toString().toUpperCase(Objects.requireNonNullElse(l, Locale.US)));
break;
}
case DateTime.DATE_TIME: { // 'c' (Sat Nov 04 12:02:33 EST 1999)

7
jdk/src/java.base/share/classes/java/util/Objects.java
View File

@ -295,7 +295,7 @@ public final class Objects {
* {@code defaultObj} is {@code null}
* @since 9
*/
public static <T> T nonNullElse(T obj, T defaultObj) {
public static <T> T requireNonNullElse(T obj, T defaultObj) {
return (obj != null) ? obj : requireNonNull(defaultObj, "defaultObj");
}
@ -314,8 +314,9 @@ public final class Objects {
* the {@code supplier.get()} value is {@code null}
* @since 9
*/
public static <T> T nonNullElseGet(T obj, Supplier<? extends T> supplier) {
return (obj != null) ? obj : requireNonNull(requireNonNull(supplier, "supplier").get(), "supplier.get()");
public static <T> T requireNonNullElseGet(T obj, Supplier<? extends T> supplier) {
return (obj != null) ? obj
: requireNonNull(requireNonNull(supplier, "supplier").get(), "supplier.get()");
}
/**

2
jdk/src/java.base/share/classes/java/util/Random.java
View File

@ -34,7 +34,7 @@ import java.util.stream.IntStream;
import java.util.stream.LongStream;
import java.util.stream.StreamSupport;
import sun.misc.Unsafe;
import jdk.internal.misc.Unsafe;
/**
* An instance of this class is used to generate a stream of

2
jdk/src/java.base/share/classes/java/util/concurrent/CompletableFuture.java
View File

@ -2775,7 +2775,7 @@ public class CompletableFuture<T> implements Future<T>, CompletionStage<T> {
}
// Unsafe mechanics
private static final sun.misc.Unsafe U = sun.misc.Unsafe.getUnsafe();
private static final jdk.internal.misc.Unsafe U = jdk.internal.misc.Unsafe.getUnsafe();
private static final long RESULT;
private static final long STACK;
private static final long NEXT;

6
jdk/src/java.base/share/classes/java/util/concurrent/ConcurrentHashMap.java
View File

@ -297,7 +297,7 @@ public class ConcurrentHashMap<K,V> extends AbstractMap<K,V>
* Table accesses require volatile/atomic reads, writes, and
* CASes. Because there is no other way to arrange this without
* adding further indirections, we use intrinsics
* (sun.misc.Unsafe) operations.
* (jdk.internal.misc.Unsafe) operations.
*
* We use the top (sign) bit of Node hash fields for control
* purposes -- it is available anyway because of addressing
@ -3287,7 +3287,7 @@ public class ConcurrentHashMap<K,V> extends AbstractMap<K,V>
return true;
}
private static final sun.misc.Unsafe U = sun.misc.Unsafe.getUnsafe();
private static final jdk.internal.misc.Unsafe U = jdk.internal.misc.Unsafe.getUnsafe();
private static final long LOCKSTATE;
static {
try {
@ -6330,7 +6330,7 @@ public class ConcurrentHashMap<K,V> extends AbstractMap<K,V>
}
// Unsafe mechanics
private static final sun.misc.Unsafe U = sun.misc.Unsafe.getUnsafe();
private static final jdk.internal.misc.Unsafe U = jdk.internal.misc.Unsafe.getUnsafe();
private static final long SIZECTL;
private static final long TRANSFERINDEX;
private static final long BASECOUNT;

4
jdk/src/java.base/share/classes/java/util/concurrent/ConcurrentLinkedDeque.java
View File

@ -326,7 +326,7 @@ public class ConcurrentLinkedDeque<E>
// Unsafe mechanics
private static final sun.misc.Unsafe U = sun.misc.Unsafe.getUnsafe();
private static final jdk.internal.misc.Unsafe U = jdk.internal.misc.Unsafe.getUnsafe();
private static final long PREV;
private static final long ITEM;
private static final long NEXT;
@ -1608,7 +1608,7 @@ public class ConcurrentLinkedDeque<E>
// Unsafe mechanics
private static final sun.misc.Unsafe U = sun.misc.Unsafe.getUnsafe();
private static final jdk.internal.misc.Unsafe U = jdk.internal.misc.Unsafe.getUnsafe();
private static final long HEAD;
private static final long TAIL;
static {

2
jdk/src/java.base/share/classes/java/util/concurrent/ConcurrentLinkedQueue.java
View File

@ -929,7 +929,7 @@ public class ConcurrentLinkedQueue<E> extends AbstractQueue<E>
// Unsafe mechanics
private static final sun.misc.Unsafe U = sun.misc.Unsafe.getUnsafe();
private static final jdk.internal.misc.Unsafe U = jdk.internal.misc.Unsafe.getUnsafe();
private static final long HEAD;
private static final long TAIL;
private static final long ITEM;

6
jdk/src/java.base/share/classes/java/util/concurrent/ConcurrentSkipListMap.java
View File

@ -534,7 +534,7 @@ public class ConcurrentSkipListMap<K,V> extends AbstractMap<K,V>
// Unsafe mechanics
private static final sun.misc.Unsafe U = sun.misc.Unsafe.getUnsafe();
private static final jdk.internal.misc.Unsafe U = jdk.internal.misc.Unsafe.getUnsafe();
private static final long VALUE;
private static final long NEXT;
@ -614,7 +614,7 @@ public class ConcurrentSkipListMap<K,V> extends AbstractMap<K,V>
}
// Unsafe mechanics
private static final sun.misc.Unsafe U = sun.misc.Unsafe.getUnsafe();
private static final jdk.internal.misc.Unsafe U = jdk.internal.misc.Unsafe.getUnsafe();
private static final long RIGHT;
static {
try {
@ -3596,7 +3596,7 @@ public class ConcurrentSkipListMap<K,V> extends AbstractMap<K,V>
}
// Unsafe mechanics
private static final sun.misc.Unsafe U = sun.misc.Unsafe.getUnsafe();
private static final jdk.internal.misc.Unsafe U = jdk.internal.misc.Unsafe.getUnsafe();
private static final long HEAD;
static {
try {

2
jdk/src/java.base/share/classes/java/util/concurrent/ConcurrentSkipListSet.java
View File

@ -510,7 +510,7 @@ public class ConcurrentSkipListSet<E>
U.putObjectVolatile(this, MAP, map);
}
private static final sun.misc.Unsafe U = sun.misc.Unsafe.getUnsafe();
private static final jdk.internal.misc.Unsafe U = jdk.internal.misc.Unsafe.getUnsafe();
private static final long MAP;
static {
try {

2
jdk/src/java.base/share/classes/java/util/concurrent/CopyOnWriteArrayList.java
View File

@ -1545,7 +1545,7 @@ public class CopyOnWriteArrayList<E>
private void resetLock() {
U.putObjectVolatile(this, LOCK, new Object());
}
private static final sun.misc.Unsafe U = sun.misc.Unsafe.getUnsafe();
private static final jdk.internal.misc.Unsafe U = jdk.internal.misc.Unsafe.getUnsafe();
private static final long LOCK;
static {
try {

2
jdk/src/java.base/share/classes/java/util/concurrent/CountedCompleter.java
View File

@ -754,7 +754,7 @@ public abstract class CountedCompleter<T> extends ForkJoinTask<T> {
protected void setRawResult(T t) { }
// Unsafe mechanics
private static final sun.misc.Unsafe U = sun.misc.Unsafe.getUnsafe();
private static final jdk.internal.misc.Unsafe U = jdk.internal.misc.Unsafe.getUnsafe();
private static final long PENDING;
static {
try {

2
jdk/src/java.base/share/classes/java/util/concurrent/Exchanger.java
View File

@ -625,7 +625,7 @@ public class Exchanger<V> {
}
// Unsafe mechanics
private static final sun.misc.Unsafe U = sun.misc.Unsafe.getUnsafe();
private static final jdk.internal.misc.Unsafe U = jdk.internal.misc.Unsafe.getUnsafe();
private static final long BOUND;
private static final long SLOT;
private static final long MATCH;

4
jdk/src/java.base/share/classes/java/util/concurrent/ForkJoinPool.java
View File

@ -1337,7 +1337,7 @@ public class ForkJoinPool extends AbstractExecutorService {
}
// Unsafe mechanics. Note that some are (and must be) the same as in FJP
private static final sun.misc.Unsafe U = sun.misc.Unsafe.getUnsafe();
private static final jdk.internal.misc.Unsafe U = jdk.internal.misc.Unsafe.getUnsafe();
private static final long QLOCK;
private static final int ABASE;
private static final int ASHIFT;
@ -3452,7 +3452,7 @@ public class ForkJoinPool extends AbstractExecutorService {
}
// Unsafe mechanics
private static final sun.misc.Unsafe U = sun.misc.Unsafe.getUnsafe();
private static final jdk.internal.misc.Unsafe U = jdk.internal.misc.Unsafe.getUnsafe();
private static final long CTL;
private static final long RUNSTATE;
private static final int ABASE;

2
jdk/src/java.base/share/classes/java/util/concurrent/ForkJoinTask.java
View File

@ -1517,7 +1517,7 @@ public abstract class ForkJoinTask<V> implements Future<V>, Serializable {
}
// Unsafe mechanics
private static final sun.misc.Unsafe U = sun.misc.Unsafe.getUnsafe();
private static final jdk.internal.misc.Unsafe U = jdk.internal.misc.Unsafe.getUnsafe();
private static final long STATUS;
static {

4
jdk/src/java.base/share/classes/java/util/concurrent/ForkJoinWorkerThread.java
View File

@ -185,7 +185,7 @@ public class ForkJoinWorkerThread extends Thread {
}
// Set up to allow setting thread fields in constructor
private static final sun.misc.Unsafe U = sun.misc.Unsafe.getUnsafe();
private static final jdk.internal.misc.Unsafe U = jdk.internal.misc.Unsafe.getUnsafe();
private static final long THREADLOCALS;
private static final long INHERITABLETHREADLOCALS;
private static final long INHERITEDACCESSCONTROLCONTEXT;
@ -248,7 +248,7 @@ public class ForkJoinWorkerThread extends Thread {
*/
private static ThreadGroup createThreadGroup() {
try {
sun.misc.Unsafe u = sun.misc.Unsafe.getUnsafe();
jdk.internal.misc.Unsafe u = jdk.internal.misc.Unsafe.getUnsafe();
long tg = u.objectFieldOffset
(Thread.class.getDeclaredField("group"));
long gp = u.objectFieldOffset

2
jdk/src/java.base/share/classes/java/util/concurrent/FutureTask.java
View File

@ -484,7 +484,7 @@ public class FutureTask<V> implements RunnableFuture<V> {
}
// Unsafe mechanics
private static final sun.misc.Unsafe U = sun.misc.Unsafe.getUnsafe();
private static final jdk.internal.misc.Unsafe U = jdk.internal.misc.Unsafe.getUnsafe();
private static final long STATE;
private static final long RUNNER;
private static final long WAITERS;

4
jdk/src/java.base/share/classes/java/util/concurrent/LinkedTransferQueue.java
View File

@ -538,7 +538,7 @@ public class LinkedTransferQueue<E> extends AbstractQueue<E>
private static final long serialVersionUID = -3375979862319811754L;
// Unsafe mechanics
private static final sun.misc.Unsafe U = sun.misc.Unsafe.getUnsafe();
private static final jdk.internal.misc.Unsafe U = jdk.internal.misc.Unsafe.getUnsafe();
private static final long ITEM;
private static final long NEXT;
private static final long WAITER;
@ -1564,7 +1564,7 @@ public class LinkedTransferQueue<E> extends AbstractQueue<E>
// Unsafe mechanics
private static final sun.misc.Unsafe U = sun.misc.Unsafe.getUnsafe();
private static final jdk.internal.misc.Unsafe U = jdk.internal.misc.Unsafe.getUnsafe();
private static final long HEAD;
private static final long TAIL;
private static final long SWEEPVOTES;

2
jdk/src/java.base/share/classes/java/util/concurrent/Phaser.java
View File

@ -1137,7 +1137,7 @@ public class Phaser {
// Unsafe mechanics
private static final sun.misc.Unsafe U = sun.misc.Unsafe.getUnsafe();
private static final jdk.internal.misc.Unsafe U = jdk.internal.misc.Unsafe.getUnsafe();
private static final long STATE;
static {
try {

2
jdk/src/java.base/share/classes/java/util/concurrent/PriorityBlockingQueue.java
View File

@ -1010,7 +1010,7 @@ public class PriorityBlockingQueue<E> extends AbstractQueue<E>
}
// Unsafe mechanics
private static final sun.misc.Unsafe U = sun.misc.Unsafe.getUnsafe();
private static final jdk.internal.misc.Unsafe U = jdk.internal.misc.Unsafe.getUnsafe();
private static final long ALLOCATIONSPINLOCK;
static {
try {

2
jdk/src/java.base/share/classes/java/util/concurrent/SubmissionPublisher.java
View File

@ -1596,7 +1596,7 @@ public class SubmissionPublisher<T> implements Flow.Publisher<T>,
}
// Unsafe mechanics
private static final sun.misc.Unsafe U = sun.misc.Unsafe.getUnsafe();
private static final jdk.internal.misc.Unsafe U = jdk.internal.misc.Unsafe.getUnsafe();
private static final long CTL;
private static final long TAIL;
private static final long HEAD;

8
jdk/src/java.base/share/classes/java/util/concurrent/SynchronousQueue.java
View File

@ -283,7 +283,7 @@ public class SynchronousQueue<E> extends AbstractQueue<E>
}
// Unsafe mechanics
private static final sun.misc.Unsafe U = sun.misc.Unsafe.getUnsafe();
private static final jdk.internal.misc.Unsafe U = jdk.internal.misc.Unsafe.getUnsafe();
private static final long MATCH;
private static final long NEXT;
@ -509,7 +509,7 @@ public class SynchronousQueue<E> extends AbstractQueue<E>
}
// Unsafe mechanics
private static final sun.misc.Unsafe U = sun.misc.Unsafe.getUnsafe();
private static final jdk.internal.misc.Unsafe U = jdk.internal.misc.Unsafe.getUnsafe();
private static final long HEAD;
static {
try {
@ -575,7 +575,7 @@ public class SynchronousQueue<E> extends AbstractQueue<E>
}
// Unsafe mechanics
private static final sun.misc.Unsafe U = sun.misc.Unsafe.getUnsafe();
private static final jdk.internal.misc.Unsafe U = jdk.internal.misc.Unsafe.getUnsafe();
private static final long ITEM;
private static final long NEXT;
@ -817,7 +817,7 @@ public class SynchronousQueue<E> extends AbstractQueue<E>
}
}
private static final sun.misc.Unsafe U = sun.misc.Unsafe.getUnsafe();
private static final jdk.internal.misc.Unsafe U = jdk.internal.misc.Unsafe.getUnsafe();
private static final long HEAD;
private static final long TAIL;
private static final long CLEANME;

2
jdk/src/java.base/share/classes/java/util/concurrent/ThreadLocalRandom.java
View File

@ -1050,7 +1050,7 @@ public class ThreadLocalRandom extends Random {
}
// Unsafe mechanics
private static final sun.misc.Unsafe U = sun.misc.Unsafe.getUnsafe();
private static final jdk.internal.misc.Unsafe U = jdk.internal.misc.Unsafe.getUnsafe();
private static final long SEED;
private static final long PROBE;
private static final long SECONDARY;

2
jdk/src/java.base/share/classes/java/util/concurrent/atomic/AtomicBoolean.java
View File

@ -49,7 +49,7 @@ package java.util.concurrent.atomic;
public class AtomicBoolean implements java.io.Serializable {
private static final long serialVersionUID = 4654671469794556979L;
private static final sun.misc.Unsafe U = sun.misc.Unsafe.getUnsafe();
private static final jdk.internal.misc.Unsafe U = jdk.internal.misc.Unsafe.getUnsafe();
private static final long VALUE;
static {

2
jdk/src/java.base/share/classes/java/util/concurrent/atomic/AtomicInteger.java
View File

@ -54,7 +54,7 @@ import java.util.function.IntUnaryOperator;
public class AtomicInteger extends Number implements java.io.Serializable {
private static final long serialVersionUID = 6214790243416807050L;
private static final sun.misc.Unsafe U = sun.misc.Unsafe.getUnsafe();
private static final jdk.internal.misc.Unsafe U = jdk.internal.misc.Unsafe.getUnsafe();
private static final long VALUE;
static {

2
jdk/src/java.base/share/classes/java/util/concurrent/atomic/AtomicIntegerArray.java
View File

@ -49,7 +49,7 @@ import java.util.function.IntUnaryOperator;
public class AtomicIntegerArray implements java.io.Serializable {
private static final long serialVersionUID = 2862133569453604235L;
private static final sun.misc.Unsafe U = sun.misc.Unsafe.getUnsafe();
private static final jdk.internal.misc.Unsafe U = jdk.internal.misc.Unsafe.getUnsafe();
private static final int ABASE;
private static final int ASHIFT;
private final int[] array;

2
jdk/src/java.base/share/classes/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.java
View File

@ -367,7 +367,7 @@ public abstract class AtomicIntegerFieldUpdater<T> {
*/
private static class AtomicIntegerFieldUpdaterImpl<T>
extends AtomicIntegerFieldUpdater<T> {
private static final sun.misc.Unsafe U = sun.misc.Unsafe.getUnsafe();
private static final jdk.internal.misc.Unsafe U = jdk.internal.misc.Unsafe.getUnsafe();
private final long offset;
private final Class<T> tclass;
private final Class<?> cclass;

2
jdk/src/java.base/share/classes/java/util/concurrent/atomic/AtomicLong.java
View File

@ -54,7 +54,7 @@ import java.util.function.LongUnaryOperator;
public class AtomicLong extends Number implements java.io.Serializable {
private static final long serialVersionUID = 1927816293512124184L;
private static final sun.misc.Unsafe U = sun.misc.Unsafe.getUnsafe();
private static final jdk.internal.misc.Unsafe U = jdk.internal.misc.Unsafe.getUnsafe();
private static final long VALUE;
/**

2
jdk/src/java.base/share/classes/java/util/concurrent/atomic/AtomicLongArray.java
View File

@ -48,7 +48,7 @@ import java.util.function.LongUnaryOperator;
public class AtomicLongArray implements java.io.Serializable {
private static final long serialVersionUID = -2308431214976778248L;
private static final sun.misc.Unsafe U = sun.misc.Unsafe.getUnsafe();
private static final jdk.internal.misc.Unsafe U = jdk.internal.misc.Unsafe.getUnsafe();
private static final int ABASE;
private static final int ASHIFT;
private final long[] array;

4
jdk/src/java.base/share/classes/java/util/concurrent/atomic/AtomicLongFieldUpdater.java
View File

@ -366,7 +366,7 @@ public abstract class AtomicLongFieldUpdater<T> {
}
private static class CASUpdater<T> extends AtomicLongFieldUpdater<T> {
private static final sun.misc.Unsafe U = sun.misc.Unsafe.getUnsafe();
private static final jdk.internal.misc.Unsafe U = jdk.internal.misc.Unsafe.getUnsafe();
private final long offset;
private final Class<T> tclass;
private final Class<?> cclass;
@ -490,7 +490,7 @@ public abstract class AtomicLongFieldUpdater<T> {
private static class LockedUpdater<T> extends AtomicLongFieldUpdater<T> {
private static final sun.misc.Unsafe U = sun.misc.Unsafe.getUnsafe();
private static final jdk.internal.misc.Unsafe U = jdk.internal.misc.Unsafe.getUnsafe();
private final long offset;
private final Class<T> tclass;
private final Class<?> cclass;

2
jdk/src/java.base/share/classes/java/util/concurrent/atomic/AtomicMarkableReference.java
View File

@ -190,7 +190,7 @@ public class AtomicMarkableReference<V> {
// Unsafe mechanics
private static final sun.misc.Unsafe U = sun.misc.Unsafe.getUnsafe();
private static final jdk.internal.misc.Unsafe U = jdk.internal.misc.Unsafe.getUnsafe();
private static final long PAIR;
static {
try {

2
jdk/src/java.base/share/classes/java/util/concurrent/atomic/AtomicReference.java
View File

@ -49,7 +49,7 @@ import java.util.function.UnaryOperator;
public class AtomicReference<V> implements java.io.Serializable {
private static final long serialVersionUID = -1848883965231344442L;
private static final sun.misc.Unsafe U = sun.misc.Unsafe.getUnsafe();
private static final jdk.internal.misc.Unsafe U = jdk.internal.misc.Unsafe.getUnsafe();
private static final long VALUE;
static {

2
jdk/src/java.base/share/classes/java/util/concurrent/atomic/AtomicReferenceArray.java
View File

@ -52,7 +52,7 @@ import java.util.function.UnaryOperator;
public class AtomicReferenceArray<E> implements java.io.Serializable {
private static final long serialVersionUID = -6209656149925076980L;
private static final sun.misc.Unsafe U = sun.misc.Unsafe.getUnsafe();
private static final jdk.internal.misc.Unsafe U = jdk.internal.misc.Unsafe.getUnsafe();
private static final long ARRAY;
private static final int ABASE;
private static final int ASHIFT;

2
jdk/src/java.base/share/classes/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.java
View File

@ -284,7 +284,7 @@ public abstract class AtomicReferenceFieldUpdater<T,V> {
private static final class AtomicReferenceFieldUpdaterImpl<T,V>
extends AtomicReferenceFieldUpdater<T,V> {
private static final sun.misc.Unsafe U = sun.misc.Unsafe.getUnsafe();
private static final jdk.internal.misc.Unsafe U = jdk.internal.misc.Unsafe.getUnsafe();
private final long offset;
private final Class<T> tclass;
private final Class<V> vclass;

2
jdk/src/java.base/share/classes/java/util/concurrent/atomic/AtomicStampedReference.java
View File

@ -190,7 +190,7 @@ public class AtomicStampedReference<V> {
// Unsafe mechanics
private static final sun.misc.Unsafe U = sun.misc.Unsafe.getUnsafe();
private static final jdk.internal.misc.Unsafe U = jdk.internal.misc.Unsafe.getUnsafe();
private static final long PAIR;
static {
try {

4
jdk/src/java.base/share/classes/java/util/concurrent/atomic/Striped64.java
View File

@ -133,7 +133,7 @@ abstract class Striped64 extends Number {
}
// Unsafe mechanics
private static final sun.misc.Unsafe U = sun.misc.Unsafe.getUnsafe();
private static final jdk.internal.misc.Unsafe U = jdk.internal.misc.Unsafe.getUnsafe();
private static final long VALUE;
static {
try {
@ -372,7 +372,7 @@ abstract class Striped64 extends Number {
}
// Unsafe mechanics
private static final sun.misc.Unsafe U = sun.misc.Unsafe.getUnsafe();
private static final jdk.internal.misc.Unsafe U = jdk.internal.misc.Unsafe.getUnsafe();
private static final long BASE;
private static final long CELLSBUSY;
private static final long PROBE;

2
jdk/src/java.base/share/classes/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.java
View File

@ -1821,7 +1821,7 @@ public abstract class AbstractQueuedLongSynchronizer
* are at it, we do the same for other CASable fields (which could
* otherwise be done with atomic field updaters).
*/
private static final sun.misc.Unsafe U = sun.misc.Unsafe.getUnsafe();
private static final jdk.internal.misc.Unsafe U = jdk.internal.misc.Unsafe.getUnsafe();
private static final long STATE;
private static final long HEAD;
private static final long TAIL;

4
jdk/src/java.base/share/classes/java/util/concurrent/locks/AbstractQueuedSynchronizer.java
View File

@ -524,7 +524,7 @@ public abstract class AbstractQueuedSynchronizer
return U.compareAndSwapObject(this, NEXT, expect, update);
}
private static final sun.misc.Unsafe U = sun.misc.Unsafe.getUnsafe();
private static final jdk.internal.misc.Unsafe U = jdk.internal.misc.Unsafe.getUnsafe();
private static final long NEXT;
static final long PREV;
private static final long THREAD;
@ -2285,7 +2285,7 @@ public abstract class AbstractQueuedSynchronizer
* are at it, we do the same for other CASable fields (which could
* otherwise be done with atomic field updaters).
*/
private static final sun.misc.Unsafe U = sun.misc.Unsafe.getUnsafe();
private static final jdk.internal.misc.Unsafe U = jdk.internal.misc.Unsafe.getUnsafe();
private static final long STATE;
private static final long HEAD;
private static final long TAIL;

2
jdk/src/java.base/share/classes/java/util/concurrent/locks/LockSupport.java
View File

@ -394,7 +394,7 @@ public class LockSupport {
}
// Hotspot implementation via intrinsics API
private static final sun.misc.Unsafe U = sun.misc.Unsafe.getUnsafe();
private static final jdk.internal.misc.Unsafe U = jdk.internal.misc.Unsafe.getUnsafe();
private static final long PARKBLOCKER;
private static final long SECONDARY;
static {

2
jdk/src/java.base/share/classes/java/util/concurrent/locks/ReentrantReadWriteLock.java
View File

@ -1501,7 +1501,7 @@ public class ReentrantReadWriteLock
}
// Unsafe mechanics
private static final sun.misc.Unsafe U = sun.misc.Unsafe.getUnsafe();
private static final jdk.internal.misc.Unsafe U = jdk.internal.misc.Unsafe.getUnsafe();
private static final long TID;
static {
try {

2
jdk/src/java.base/share/classes/java/util/concurrent/locks/StampedLock.java
View File

@ -1398,7 +1398,7 @@ public class StampedLock implements java.io.Serializable {
}
// Unsafe mechanics
private static final sun.misc.Unsafe U = sun.misc.Unsafe.getUnsafe();
private static final jdk.internal.misc.Unsafe U = jdk.internal.misc.Unsafe.getUnsafe();
private static final long STATE;
private static final long WHEAD;
private static final long WTAIL;

2
jdk/src/java.base/share/classes/java/util/zip/CRC32C.java
View File

@ -28,7 +28,7 @@ import java.nio.ByteBuffer;
import java.nio.ByteOrder;
import jdk.internal.HotSpotIntrinsicCandidate;
import sun.misc.Unsafe;
import jdk.internal.misc.Unsafe;
import sun.nio.ch.DirectBuffer;
/**

2
jdk/src/java.base/share/classes/jdk/internal/misc/SharedSecrets.java
View File

@ -30,7 +30,7 @@ import java.io.Console;
import java.io.FileDescriptor;
import java.security.ProtectionDomain;
import java.security.AccessController;
import sun.misc.Unsafe;
import jdk.internal.misc.Unsafe;
/** A repository of "shared secrets", which are a mechanism for
calling implementation-private methods in another package without

6
jdk/src/java.base/share/classes/sun/invoke/anon/AnonymousClassLoader.java
View File

@ -78,7 +78,7 @@ public class AnonymousClassLoader {
this.hostClass = hostClass;
}
public static AnonymousClassLoader make(sun.misc.Unsafe unsafe, Class<?> hostClass) {
public static AnonymousClassLoader make(jdk.internal.misc.Unsafe unsafe, Class<?> hostClass) {
if (unsafe == null) throw new NullPointerException();
return new AnonymousClassLoader(hostClass);
}
@ -189,13 +189,13 @@ public class AnonymousClassLoader {
private static int fakeNameCounter = 99999;
// ignore two warnings on this line:
private static sun.misc.Unsafe unsafe = sun.misc.Unsafe.getUnsafe();
private static jdk.internal.misc.Unsafe unsafe = jdk.internal.misc.Unsafe.getUnsafe();
// preceding line requires that this class be on the boot class path
private static final Method defineAnonymousClass;
static {
Method dac = null;
Class<? extends sun.misc.Unsafe> unsafeClass = unsafe.getClass();
Class<? extends jdk.internal.misc.Unsafe> unsafeClass = unsafe.getClass();
try {
dac = unsafeClass.getMethod("defineAnonymousClass",
Class.class,

4
jdk/src/java.base/share/classes/sun/misc/InnocuousThread.java
View File

@ -36,7 +36,7 @@ import java.util.concurrent.atomic.AtomicInteger;
* ThreadGroup and supports the ability to erase ThreadLocals.
*/
public final class InnocuousThread extends ManagedLocalsThread {
private static final Unsafe UNSAFE;
private static final jdk.internal.misc.Unsafe UNSAFE;
private static final ThreadGroup INNOCUOUSTHREADGROUP;
private static final AccessControlContext ACC;
private static final long INHERITEDACCESSCONTROLCONTEXT;
@ -92,7 +92,7 @@ public final class InnocuousThread extends ManagedLocalsThread {
});
// Find and use topmost ThreadGroup as parent of new group
UNSAFE = Unsafe.getUnsafe();
UNSAFE = jdk.internal.misc.Unsafe.getUnsafe();
Class<?> tk = Thread.class;
Class<?> gk = ThreadGroup.class;

4
jdk/src/java.base/share/classes/sun/misc/ManagedLocalsThread.java
View File

@ -30,7 +30,7 @@ package sun.misc;
* locals erased on construction.
*/
public class ManagedLocalsThread 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;
@ -77,7 +77,7 @@ public class ManagedLocalsThread extends Thread {
}
static {
UNSAFE = Unsafe.getUnsafe();
UNSAFE = jdk.internal.misc.Unsafe.getUnsafe();
Class<?> t = Thread.class;
try {
THREAD_LOCALS = UNSAFE.objectFieldOffset

2
jdk/src/java.base/share/classes/sun/nio/ch/NativeObject.java
View File

@ -29,7 +29,7 @@
package sun.nio.ch; // Formerly in sun.misc
import java.nio.ByteOrder;
import sun.misc.Unsafe;
import jdk.internal.misc.Unsafe;
// ## In the fullness of time, this class will be eliminated

2
jdk/src/java.base/share/classes/sun/nio/ch/Util.java
View File

@ -35,7 +35,7 @@ import java.nio.channels.*;
import java.security.AccessController;
import java.security.PrivilegedAction;
import java.util.*;
import sun.misc.Unsafe;
import jdk.internal.misc.Unsafe;
import sun.misc.Cleaner;
import sun.security.action.GetPropertyAction;

2
jdk/src/java.base/share/classes/sun/nio/fs/Cancellable.java
View File

@ -26,7 +26,7 @@
package sun.nio.fs;
import sun.misc.ManagedLocalsThread;
import sun.misc.Unsafe;
import jdk.internal.misc.Unsafe;
import java.util.concurrent.ExecutionException;
/**

2
jdk/src/java.base/share/classes/sun/nio/fs/NativeBuffer.java
View File

@ -25,7 +25,7 @@
package sun.nio.fs;
import sun.misc.Unsafe;
import jdk.internal.misc.Unsafe;
import sun.misc.Cleaner;
/**

2
jdk/src/java.base/share/classes/sun/nio/fs/NativeBuffers.java
View File

@ -25,7 +25,7 @@
package sun.nio.fs;
import sun.misc.Unsafe;
import jdk.internal.misc.Unsafe;
/**
* Factory for native buffers.

2
jdk/src/java.base/share/classes/sun/reflect/AccessorGenerator.java
View File

@ -26,7 +26,7 @@
package sun.reflect;
import java.lang.reflect.*;
import sun.misc.Unsafe;
import jdk.internal.misc.Unsafe;
/** Shared functionality for all accessor generators */

2
jdk/src/java.base/share/classes/sun/reflect/ClassDefiner.java
View File

@ -27,7 +27,7 @@ package sun.reflect;
import java.security.AccessController;
import java.security.PrivilegedAction;
import sun.misc.Unsafe;
import jdk.internal.misc.Unsafe;
/** Utility class which assists in calling Unsafe.defineClass() by
creating a new class loader which delegates to the one needed in

2
jdk/src/java.base/share/classes/sun/reflect/FieldInfo.java
View File

@ -38,7 +38,7 @@ public class FieldInfo {
private String signature;
private int modifiers;
// This is compatible with the old reflection implementation's
// "slot" value to allow sun.misc.Unsafe to work
// "slot" value to allow jdk.internal.misc.Unsafe to work
private int slot;
// Not really necessary to provide a constructor since the VM

2
jdk/src/java.base/share/classes/sun/reflect/MagicAccessorImpl.java
View File

@ -32,7 +32,7 @@ package sun.reflect;
fields and methods of other classes. It is used to hold the code
for dynamically-generated FieldAccessorImpl and MethodAccessorImpl
subclasses. (Use of the word "unsafe" was avoided in this class's
name to avoid confusion with {@link sun.misc.Unsafe}.) </P>
name to avoid confusion with {@link jdk.internal.misc.Unsafe}.) </P>
<P> The bug fix for 4486457 also necessitated disabling
verification for this class and all subclasses, as opposed to just

2
jdk/src/java.base/share/classes/sun/reflect/ReflectionFactory.java
View File

@ -44,7 +44,7 @@ import sun.reflect.misc.ReflectUtil;
subversion of both the language and the verifier. For this reason,
they are all instance methods, and access to the constructor of
this factory is guarded by a security check, in similar style to
{@link sun.misc.Unsafe}. </P>
{@link jdk.internal.misc.Unsafe}. </P>
*/
public class ReflectionFactory {

4
jdk/src/java.base/share/classes/sun/reflect/UnsafeFieldAccessorImpl.java
View File

@ -27,9 +27,9 @@ package sun.reflect;
import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
import sun.misc.Unsafe;
import jdk.internal.misc.Unsafe;
/** Base class for sun.misc.Unsafe-based FieldAccessors. The
/** Base class for jdk.internal.misc.Unsafe-based FieldAccessors. The
observation is that there are only nine types of fields from the
standpoint of reflection code: the eight primitive types and
Object. Using class Unsafe instead of generated bytecodes saves

4
jdk/src/java.base/share/classes/sun/reflect/UnsafeQualifiedFieldAccessorImpl.java
View File

@ -27,10 +27,10 @@ package sun.reflect;
import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
import sun.misc.Unsafe;
import jdk.internal.misc.Unsafe;
/**
* Base class for sun.misc.Unsafe-based FieldAccessors for fields with
* Base class for jdk.internal.misc.Unsafe-based FieldAccessors for fields with
* final or volatile qualifiers. These differ from unqualified
* versions in that (1) they check for read-only status (2) they use
* the volatile forms of Unsafe get/put methods. (When accessed via

4
jdk/src/java.base/share/classes/sun/reflect/UnsafeQualifiedStaticFieldAccessorImpl.java
View File

@ -28,9 +28,9 @@ package sun.reflect;
import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
import java.security.AccessController;
import sun.misc.Unsafe;
import jdk.internal.misc.Unsafe;
/** Base class for sun.misc.Unsafe-based FieldAccessors for final or
/** Base class for jdk.internal.misc.Unsafe-based FieldAccessors for final or
static volatile fields. */
abstract class UnsafeQualifiedStaticFieldAccessorImpl

4
jdk/src/java.base/share/classes/sun/reflect/UnsafeStaticFieldAccessorImpl.java
View File

@ -28,9 +28,9 @@ package sun.reflect;
import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
import java.security.AccessController;
import sun.misc.Unsafe;
import jdk.internal.misc.Unsafe;
/** Base class for sun.misc.Unsafe-based FieldAccessors for static
/** Base class for jdk.internal.misc.Unsafe-based FieldAccessors for static
fields. The observation is that there are only nine types of
fields from the standpoint of reflection code: the eight primitive
types and Object. Using class Unsafe instead of generated

2
jdk/src/java.base/share/classes/sun/reflect/misc/ReflectUtil.java
View File

@ -337,7 +337,7 @@ public final class ReflectUtil {
/**
* Checks if {@code Class cls} is a VM-anonymous class
* as defined by {@link sun.misc.Unsafe#defineAnonymousClass}
* as defined by {@link jdk.internal.misc.Unsafe#defineAnonymousClass}
* (not to be confused with a Java Language anonymous inner class).
*/
public static boolean isVMAnonymousClass(Class<?> cls) {

2
jdk/src/java.base/solaris/classes/sun/nio/ch/EventPortWrapper.java
View File

@ -31,7 +31,7 @@ import java.util.BitSet;
import java.util.HashMap;
import java.util.Map;
import sun.misc.Unsafe;
import jdk.internal.misc.Unsafe;
import sun.security.action.GetIntegerAction;
import static sun.nio.ch.SolarisEventPort.*;

2
jdk/src/java.base/solaris/classes/sun/nio/ch/SolarisEventPort.java
View File

@ -28,7 +28,7 @@ package sun.nio.ch;
import java.nio.channels.spi.AsynchronousChannelProvider;
import java.util.concurrent.RejectedExecutionException;
import java.io.IOException;
import sun.misc.Unsafe;
import jdk.internal.misc.Unsafe;
/**
* Provides an AsynchronousChannelGroup implementation based on the Solaris 10

2
jdk/src/java.base/solaris/classes/sun/nio/fs/SolarisAclFileAttributeView.java
View File

@ -29,7 +29,7 @@ import java.nio.file.*;
import java.nio.file.attribute.*;
import java.util.*;
import java.io.IOException;
import sun.misc.Unsafe;
import jdk.internal.misc.Unsafe;
import static sun.nio.fs.UnixConstants.*;
import static sun.nio.fs.SolarisConstants.*;

2
jdk/src/java.base/solaris/classes/sun/nio/fs/SolarisWatchService.java
View File

@ -30,7 +30,7 @@ import java.security.AccessController;
import java.security.PrivilegedAction;
import java.util.*;
import java.io.IOException;
import sun.misc.Unsafe;
import jdk.internal.misc.Unsafe;
import static sun.nio.fs.UnixConstants.*;

2
jdk/src/java.base/windows/classes/sun/nio/ch/Iocp.java
View File

@ -36,7 +36,7 @@ import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
import java.security.AccessController;
import sun.security.action.GetPropertyAction;
import sun.misc.Unsafe;
import jdk.internal.misc.Unsafe;
/**
* Windows implementation of AsynchronousChannelGroup encapsulating an I/O

2
jdk/src/java.base/windows/classes/sun/nio/ch/PendingIoCache.java
View File

@ -27,7 +27,7 @@ package sun.nio.ch;
import java.nio.channels.*;
import java.util.*;
import sun.misc.Unsafe;
import jdk.internal.misc.Unsafe;
/**
* Maintains a mapping of pending I/O requests (identified by the address of

2
jdk/src/java.base/windows/classes/sun/nio/ch/WindowsAsynchronousServerSocketChannelImpl.java
View File

@ -33,7 +33,7 @@ import java.io.IOException;
import java.security.AccessControlContext;
import java.security.AccessController;
import java.security.PrivilegedAction;
import sun.misc.Unsafe;
import jdk.internal.misc.Unsafe;
/**
* Windows implementation of AsynchronousServerSocketChannel using overlapped I/O.

2
jdk/src/java.base/windows/classes/sun/nio/ch/WindowsAsynchronousSocketChannelImpl.java
View File

@ -34,7 +34,7 @@ import java.io.IOException;
import java.security.AccessController;
import java.security.PrivilegedActionException;
import java.security.PrivilegedExceptionAction;
import sun.misc.Unsafe;
import jdk.internal.misc.Unsafe;
/**
* Windows implementation of AsynchronousSocketChannel using overlapped I/O.

2
jdk/src/java.base/windows/classes/sun/nio/fs/WindowsFileAttributes.java
View File

@ -28,7 +28,7 @@ package sun.nio.fs;
import java.nio.file.attribute.*;
import java.util.concurrent.TimeUnit;
import java.security.AccessController;
import sun.misc.Unsafe;
import jdk.internal.misc.Unsafe;
import sun.security.action.GetPropertyAction;
import static sun.nio.fs.WindowsNativeDispatcher.*;

Some files were not shown because too many files have changed in this diff Show More