changeset 14559:78da14a3ac9e

Merge
author mullan
date Thu, 12 Nov 2015 16:09:09 -0500
parents c8e7b9c8b2fd 2a49e593ad60
children 2d7da5f834b3
files
diffstat 137 files changed, 488 insertions(+), 200 deletions(-) [+]
line wrap: on
line diff
--- a/make/src/classes/build/tools/x11wrappergen/WrapperGenerator.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/make/src/classes/build/tools/x11wrappergen/WrapperGenerator.java	Thu Nov 12 16:09:09 2015 -0500
@@ -841,7 +841,7 @@
                 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 @@
             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;");
--- a/src/java.base/aix/classes/sun/nio/ch/AixPollPort.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.base/aix/classes/sun/nio/ch/AixPollPort.java	Thu Nov 12 16:09:09 2015 -0500
@@ -34,7 +34,7 @@
 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.
--- a/src/java.base/linux/classes/sun/nio/ch/EPoll.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.base/linux/classes/sun/nio/ch/EPoll.java	Thu Nov 12 16:09:09 2015 -0500
@@ -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.
--- a/src/java.base/linux/classes/sun/nio/fs/LinuxDosFileAttributeView.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.base/linux/classes/sun/nio/fs/LinuxDosFileAttributeView.java	Thu Nov 12 16:09:09 2015 -0500
@@ -29,7 +29,7 @@
 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.*;
--- a/src/java.base/linux/classes/sun/nio/fs/LinuxUserDefinedFileAttributeView.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.base/linux/classes/sun/nio/fs/LinuxUserDefinedFileAttributeView.java	Thu Nov 12 16:09:09 2015 -0500
@@ -29,7 +29,7 @@
 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.*;
--- a/src/java.base/linux/classes/sun/nio/fs/LinuxWatchService.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.base/linux/classes/sun/nio/fs/LinuxWatchService.java	Thu Nov 12 16:09:09 2015 -0500
@@ -30,7 +30,7 @@
 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.*;
--- a/src/java.base/macosx/classes/sun/nio/ch/KQueue.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.base/macosx/classes/sun/nio/ch/KQueue.java	Thu Nov 12 16:09:09 2015 -0500
@@ -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.
--- a/src/java.base/share/classes/java/io/File.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.base/share/classes/java/io/File.java	Thu Nov 12 16:09:09 2015 -0500
@@ -2184,10 +2184,10 @@
 
     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(
--- a/src/java.base/share/classes/java/io/ObjectInputStream.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.base/share/classes/java/io/ObjectInputStream.java	Thu Nov 12 16:09:09 2015 -0500
@@ -40,7 +40,7 @@
 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;
 
 /**
--- a/src/java.base/share/classes/java/io/ObjectStreamClass.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.base/share/classes/java/io/ObjectStreamClass.java	Thu Nov 12 16:09:09 2015 -0500
@@ -48,7 +48,7 @@
 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;
--- a/src/java.base/share/classes/java/lang/Class.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.base/share/classes/java/lang/Class.java	Thu Nov 12 16:09:09 2015 -0500
@@ -55,7 +55,7 @@
 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;
--- a/src/java.base/share/classes/java/lang/invoke/DirectMethodHandle.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.base/share/classes/java/lang/invoke/DirectMethodHandle.java	Thu Nov 12 16:09:09 2015 -0500
@@ -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;
--- a/src/java.base/share/classes/java/lang/invoke/InnerClassLambdaMetafactory.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.base/share/classes/java/lang/invoke/InnerClassLambdaMetafactory.java	Thu Nov 12 16:09:09 2015 -0500
@@ -27,7 +27,7 @@
 
 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;
--- a/src/java.base/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.base/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java	Thu Nov 12 16:09:09 2015 -0500
@@ -775,7 +775,7 @@
         // 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
     };
 
--- a/src/java.base/share/classes/java/lang/invoke/MethodHandleNatives.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.base/share/classes/java/lang/invoke/MethodHandleNatives.java	Thu Nov 12 16:09:09 2015 -0500
@@ -50,7 +50,7 @@
     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
--- a/src/java.base/share/classes/java/lang/invoke/MethodHandleStatics.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.base/share/classes/java/lang/invoke/MethodHandleStatics.java	Thu Nov 12 16:09:09 2015 -0500
@@ -27,7 +27,7 @@
 
 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
--- a/src/java.base/share/classes/java/math/BigDecimal.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.base/share/classes/java/math/BigDecimal.java	Thu Nov 12 16:09:09 2015 -0500
@@ -3726,12 +3726,12 @@
     }
 
     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
--- a/src/java.base/share/classes/java/math/BigInteger.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.base/share/classes/java/math/BigInteger.java	Thu Nov 12 16:09:09 2015 -0500
@@ -4526,12 +4526,12 @@
 
     // 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
--- a/src/java.base/share/classes/java/net/Inet6Address.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.base/share/classes/java/net/Inet6Address.java	Thu Nov 12 16:09:09 2015 -0500
@@ -576,11 +576,11 @@
     };
 
     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;
--- a/src/java.base/share/classes/java/net/InetAddress.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.base/share/classes/java/net/InetAddress.java	Thu Nov 12 16:09:09 2015 -0500
@@ -29,6 +29,7 @@
 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 @@
      */
     public String toString() {
         String hostName = holder().getHostName();
-        return ((hostName != null) ? hostName : "")
+        return Objects.toString(hostName, "")
             + "/" + getHostAddress();
     }
 
@@ -1493,11 +1494,11 @@
     }
 
     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")
             );
--- a/src/java.base/share/classes/java/net/InetSocketAddress.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.base/share/classes/java/net/InetSocketAddress.java	Thu Nov 12 16:09:09 2015 -0500
@@ -303,10 +303,10 @@
     }
 
     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;
--- a/src/java.base/share/classes/java/net/SocketOptions.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.base/share/classes/java/net/SocketOptions.java	Thu Nov 12 16:09:09 2015 -0500
@@ -61,21 +61,21 @@
      * 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 @@
 
     /**
      * 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 @@
      * <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>
      *
--- a/src/java.base/share/classes/java/net/URLConnection.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.base/share/classes/java/net/URLConnection.java	Thu Nov 12 16:09:09 2015 -0500
@@ -32,6 +32,7 @@
 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 @@
 
         if (handler != null) {
             ContentHandler h = handlers.putIfAbsent(contentType, handler);
-            return h != null ? h : handler;
+            return Objects.requireNonNullElse(h, handler);
         }
 
         try {
@@ -1263,7 +1264,7 @@
         assert handler != null;
 
         ContentHandler h = handlers.putIfAbsent(contentType, handler);
-        return h != null ? h : handler;
+        return Objects.requireNonNullElse(h, handler);
     }
 
     /*
--- a/src/java.base/share/classes/java/nio/MappedByteBuffer.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.base/share/classes/java/nio/MappedByteBuffer.java	Thu Nov 12 16:09:09 2015 -0500
@@ -26,7 +26,7 @@
 package java.nio;
 
 import java.io.FileDescriptor;
-import sun.misc.Unsafe;
+import jdk.internal.misc.Unsafe;
 
 
 /**
--- a/src/java.base/share/classes/java/nio/charset/Charset.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.base/share/classes/java/nio/charset/Charset.java	Thu Nov 12 16:09:09 2015 -0500
@@ -37,6 +37,7 @@
 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 @@
 
     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 @@
      */
     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;
--- a/src/java.base/share/classes/java/security/SecureRandom.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.base/share/classes/java/security/SecureRandom.java	Thu Nov 12 16:09:09 2015 -0500
@@ -419,7 +419,7 @@
      * @since 1.5
      */
     public String getAlgorithm() {
-        return (algorithm != null) ? algorithm : "unknown";
+        return Objects.toString(algorithm, "unknown");
     }
 
     /**
--- a/src/java.base/share/classes/java/time/ZoneId.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.base/share/classes/java/time/ZoneId.java	Thu Nov 12 16:09:09 2015 -0500
@@ -310,8 +310,7 @@
     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);
     }
 
--- a/src/java.base/share/classes/java/time/chrono/Chronology.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.base/share/classes/java/time/chrono/Chronology.java	Thu Nov 12 16:09:09 2015 -0500
@@ -177,7 +177,7 @@
     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);
     }
 
     //-----------------------------------------------------------------------
--- a/src/java.base/share/classes/java/time/format/DateTimeFormatterBuilder.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.base/share/classes/java/time/format/DateTimeFormatterBuilder.java	Thu Nov 12 16:09:09 2015 -0500
@@ -2892,7 +2892,8 @@
 
         @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 @@
                     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 @@
         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());
         }
     }
 
--- a/src/java.base/share/classes/java/time/format/DateTimePrintContext.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.base/share/classes/java/time/format/DateTimePrintContext.java	Thu Nov 12 16:09:09 2015 -0500
@@ -146,7 +146,7 @@
         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
--- a/src/java.base/share/classes/java/time/temporal/IsoFields.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.base/share/classes/java/time/temporal/IsoFields.java	Thu Nov 12 16:09:09 2015 -0500
@@ -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 @@
  * 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 @@
         //-------------------------------------------------------------------------
         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 @@
 
         @Override
         public boolean isSupportedBy(Temporal temporal) {
-            return temporal.isSupported(EPOCH_DAY);
+            return temporal.isSupported(EPOCH_DAY) && isIso(temporal);
         }
 
         @SuppressWarnings("unchecked")
@@ -721,4 +718,8 @@
             return name;
         }
     }
+
+    static boolean isIso(TemporalAccessor temporal) {
+        return Chronology.from(temporal).equals(IsoChronology.INSTANCE);
+    }
 }
--- a/src/java.base/share/classes/java/util/Formatter.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.base/share/classes/java/util/Formatter.java	Thu Nov 12 16:09:09 2015 -0500
@@ -49,6 +49,7 @@
 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 @@
                     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 @@
                 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 @@
             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 @@
             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 @@
                 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 @@
                         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 @@
                         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 @@
                 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 @@
                 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 @@
                     // 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)
--- a/src/java.base/share/classes/java/util/Objects.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.base/share/classes/java/util/Objects.java	Thu Nov 12 16:09:09 2015 -0500
@@ -295,7 +295,7 @@
      *        {@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 @@
      *        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()");
     }
 
     /**
--- a/src/java.base/share/classes/java/util/Random.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.base/share/classes/java/util/Random.java	Thu Nov 12 16:09:09 2015 -0500
@@ -34,7 +34,7 @@
 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
--- a/src/java.base/share/classes/java/util/concurrent/CompletableFuture.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.base/share/classes/java/util/concurrent/CompletableFuture.java	Thu Nov 12 16:09:09 2015 -0500
@@ -2775,7 +2775,7 @@
     }
 
     // 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;
--- a/src/java.base/share/classes/java/util/concurrent/ConcurrentHashMap.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.base/share/classes/java/util/concurrent/ConcurrentHashMap.java	Thu Nov 12 16:09:09 2015 -0500
@@ -297,7 +297,7 @@
      * 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 @@
             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 @@
     }
 
     // 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;
--- a/src/java.base/share/classes/java/util/concurrent/ConcurrentLinkedDeque.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.base/share/classes/java/util/concurrent/ConcurrentLinkedDeque.java	Thu Nov 12 16:09:09 2015 -0500
@@ -326,7 +326,7 @@
 
         // 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 @@
 
     // 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 {
--- a/src/java.base/share/classes/java/util/concurrent/ConcurrentLinkedQueue.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.base/share/classes/java/util/concurrent/ConcurrentLinkedQueue.java	Thu Nov 12 16:09:09 2015 -0500
@@ -929,7 +929,7 @@
 
     // 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;
--- a/src/java.base/share/classes/java/util/concurrent/ConcurrentSkipListMap.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.base/share/classes/java/util/concurrent/ConcurrentSkipListMap.java	Thu Nov 12 16:09:09 2015 -0500
@@ -534,7 +534,7 @@
 
         // 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 @@
         }
 
         // 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 @@
     }
 
     // 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 {
--- a/src/java.base/share/classes/java/util/concurrent/ConcurrentSkipListSet.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.base/share/classes/java/util/concurrent/ConcurrentSkipListSet.java	Thu Nov 12 16:09:09 2015 -0500
@@ -510,7 +510,7 @@
         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 {
--- a/src/java.base/share/classes/java/util/concurrent/CopyOnWriteArrayList.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.base/share/classes/java/util/concurrent/CopyOnWriteArrayList.java	Thu Nov 12 16:09:09 2015 -0500
@@ -1545,7 +1545,7 @@
     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 {
--- a/src/java.base/share/classes/java/util/concurrent/CountedCompleter.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.base/share/classes/java/util/concurrent/CountedCompleter.java	Thu Nov 12 16:09:09 2015 -0500
@@ -754,7 +754,7 @@
     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 {
--- a/src/java.base/share/classes/java/util/concurrent/Exchanger.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.base/share/classes/java/util/concurrent/Exchanger.java	Thu Nov 12 16:09:09 2015 -0500
@@ -625,7 +625,7 @@
     }
 
     // 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;
--- a/src/java.base/share/classes/java/util/concurrent/ForkJoinPool.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.base/share/classes/java/util/concurrent/ForkJoinPool.java	Thu Nov 12 16:09:09 2015 -0500
@@ -1337,7 +1337,7 @@
         }
 
         // 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 @@
     }
 
     // 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;
--- a/src/java.base/share/classes/java/util/concurrent/ForkJoinTask.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.base/share/classes/java/util/concurrent/ForkJoinTask.java	Thu Nov 12 16:09:09 2015 -0500
@@ -1517,7 +1517,7 @@
     }
 
     // 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 {
--- a/src/java.base/share/classes/java/util/concurrent/ForkJoinWorkerThread.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.base/share/classes/java/util/concurrent/ForkJoinWorkerThread.java	Thu Nov 12 16:09:09 2015 -0500
@@ -185,7 +185,7 @@
     }
 
     // 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 @@
          */
         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
--- a/src/java.base/share/classes/java/util/concurrent/FutureTask.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.base/share/classes/java/util/concurrent/FutureTask.java	Thu Nov 12 16:09:09 2015 -0500
@@ -484,7 +484,7 @@
     }
 
     // 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;
--- a/src/java.base/share/classes/java/util/concurrent/LinkedTransferQueue.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.base/share/classes/java/util/concurrent/LinkedTransferQueue.java	Thu Nov 12 16:09:09 2015 -0500
@@ -538,7 +538,7 @@
         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 @@
 
     // 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;
--- a/src/java.base/share/classes/java/util/concurrent/Phaser.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.base/share/classes/java/util/concurrent/Phaser.java	Thu Nov 12 16:09:09 2015 -0500
@@ -1137,7 +1137,7 @@
 
     // 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 {
--- a/src/java.base/share/classes/java/util/concurrent/PriorityBlockingQueue.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.base/share/classes/java/util/concurrent/PriorityBlockingQueue.java	Thu Nov 12 16:09:09 2015 -0500
@@ -1010,7 +1010,7 @@
     }
 
     // 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 {
--- a/src/java.base/share/classes/java/util/concurrent/SubmissionPublisher.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.base/share/classes/java/util/concurrent/SubmissionPublisher.java	Thu Nov 12 16:09:09 2015 -0500
@@ -1596,7 +1596,7 @@
         }
 
         // 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;
--- a/src/java.base/share/classes/java/util/concurrent/SynchronousQueue.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.base/share/classes/java/util/concurrent/SynchronousQueue.java	Thu Nov 12 16:09:09 2015 -0500
@@ -283,7 +283,7 @@
             }
 
             // 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 @@
         }
 
         // 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 @@
             }
 
             // 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 @@
             }
         }
 
-        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;
--- a/src/java.base/share/classes/java/util/concurrent/ThreadLocalRandom.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.base/share/classes/java/util/concurrent/ThreadLocalRandom.java	Thu Nov 12 16:09:09 2015 -0500
@@ -1050,7 +1050,7 @@
     }
 
     // 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;
--- a/src/java.base/share/classes/java/util/concurrent/atomic/AtomicBoolean.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.base/share/classes/java/util/concurrent/atomic/AtomicBoolean.java	Thu Nov 12 16:09:09 2015 -0500
@@ -49,7 +49,7 @@
 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 {
--- a/src/java.base/share/classes/java/util/concurrent/atomic/AtomicInteger.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.base/share/classes/java/util/concurrent/atomic/AtomicInteger.java	Thu Nov 12 16:09:09 2015 -0500
@@ -54,7 +54,7 @@
 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 {
--- a/src/java.base/share/classes/java/util/concurrent/atomic/AtomicIntegerArray.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.base/share/classes/java/util/concurrent/atomic/AtomicIntegerArray.java	Thu Nov 12 16:09:09 2015 -0500
@@ -49,7 +49,7 @@
 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;
--- a/src/java.base/share/classes/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.base/share/classes/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.java	Thu Nov 12 16:09:09 2015 -0500
@@ -367,7 +367,7 @@
      */
     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;
--- a/src/java.base/share/classes/java/util/concurrent/atomic/AtomicLong.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.base/share/classes/java/util/concurrent/atomic/AtomicLong.java	Thu Nov 12 16:09:09 2015 -0500
@@ -54,7 +54,7 @@
 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;
 
     /**
--- a/src/java.base/share/classes/java/util/concurrent/atomic/AtomicLongArray.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.base/share/classes/java/util/concurrent/atomic/AtomicLongArray.java	Thu Nov 12 16:09:09 2015 -0500
@@ -48,7 +48,7 @@
 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;
--- a/src/java.base/share/classes/java/util/concurrent/atomic/AtomicLongFieldUpdater.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.base/share/classes/java/util/concurrent/atomic/AtomicLongFieldUpdater.java	Thu Nov 12 16:09:09 2015 -0500
@@ -366,7 +366,7 @@
     }
 
     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 @@
 
 
     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;
--- a/src/java.base/share/classes/java/util/concurrent/atomic/AtomicMarkableReference.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.base/share/classes/java/util/concurrent/atomic/AtomicMarkableReference.java	Thu Nov 12 16:09:09 2015 -0500
@@ -190,7 +190,7 @@
 
     // 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 {
--- a/src/java.base/share/classes/java/util/concurrent/atomic/AtomicReference.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.base/share/classes/java/util/concurrent/atomic/AtomicReference.java	Thu Nov 12 16:09:09 2015 -0500
@@ -49,7 +49,7 @@
 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 {
--- a/src/java.base/share/classes/java/util/concurrent/atomic/AtomicReferenceArray.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.base/share/classes/java/util/concurrent/atomic/AtomicReferenceArray.java	Thu Nov 12 16:09:09 2015 -0500
@@ -52,7 +52,7 @@
 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;
--- a/src/java.base/share/classes/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.base/share/classes/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.java	Thu Nov 12 16:09:09 2015 -0500
@@ -284,7 +284,7 @@
 
     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;
--- a/src/java.base/share/classes/java/util/concurrent/atomic/AtomicStampedReference.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.base/share/classes/java/util/concurrent/atomic/AtomicStampedReference.java	Thu Nov 12 16:09:09 2015 -0500
@@ -190,7 +190,7 @@
 
     // 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 {
--- a/src/java.base/share/classes/java/util/concurrent/atomic/Striped64.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.base/share/classes/java/util/concurrent/atomic/Striped64.java	Thu Nov 12 16:09:09 2015 -0500
@@ -133,7 +133,7 @@
         }
 
         // 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 @@
     }
 
     // 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;
--- a/src/java.base/share/classes/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.base/share/classes/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.java	Thu Nov 12 16:09:09 2015 -0500
@@ -1821,7 +1821,7 @@
      * 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;
--- a/src/java.base/share/classes/java/util/concurrent/locks/AbstractQueuedSynchronizer.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.base/share/classes/java/util/concurrent/locks/AbstractQueuedSynchronizer.java	Thu Nov 12 16:09:09 2015 -0500
@@ -524,7 +524,7 @@
             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 @@
      * 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;
--- a/src/java.base/share/classes/java/util/concurrent/locks/LockSupport.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.base/share/classes/java/util/concurrent/locks/LockSupport.java	Thu Nov 12 16:09:09 2015 -0500
@@ -394,7 +394,7 @@
     }
 
     // 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 {
--- a/src/java.base/share/classes/java/util/concurrent/locks/ReentrantReadWriteLock.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.base/share/classes/java/util/concurrent/locks/ReentrantReadWriteLock.java	Thu Nov 12 16:09:09 2015 -0500
@@ -1501,7 +1501,7 @@
     }
 
     // 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 {
--- a/src/java.base/share/classes/java/util/concurrent/locks/StampedLock.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.base/share/classes/java/util/concurrent/locks/StampedLock.java	Thu Nov 12 16:09:09 2015 -0500
@@ -1398,7 +1398,7 @@
     }
 
     // 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;
--- a/src/java.base/share/classes/java/util/zip/CRC32C.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.base/share/classes/java/util/zip/CRC32C.java	Thu Nov 12 16:09:09 2015 -0500
@@ -28,7 +28,7 @@
 import java.nio.ByteOrder;
 
 import jdk.internal.HotSpotIntrinsicCandidate;
-import sun.misc.Unsafe;
+import jdk.internal.misc.Unsafe;
 import sun.nio.ch.DirectBuffer;
 
 /**
--- a/src/java.base/share/classes/jdk/internal/misc/SharedSecrets.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.base/share/classes/jdk/internal/misc/SharedSecrets.java	Thu Nov 12 16:09:09 2015 -0500
@@ -30,7 +30,7 @@
 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
--- a/src/java.base/share/classes/sun/invoke/anon/AnonymousClassLoader.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.base/share/classes/sun/invoke/anon/AnonymousClassLoader.java	Thu Nov 12 16:09:09 2015 -0500
@@ -78,7 +78,7 @@
         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 @@
     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,
--- a/src/java.base/share/classes/sun/misc/InnocuousThread.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.base/share/classes/sun/misc/InnocuousThread.java	Thu Nov 12 16:09:09 2015 -0500
@@ -36,7 +36,7 @@
  * 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 @@
             });
 
             // 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;
 
--- a/src/java.base/share/classes/sun/misc/ManagedLocalsThread.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.base/share/classes/sun/misc/ManagedLocalsThread.java	Thu Nov 12 16:09:09 2015 -0500
@@ -30,7 +30,7 @@
  * 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 @@
     }
 
     static {
-        UNSAFE = Unsafe.getUnsafe();
+        UNSAFE = jdk.internal.misc.Unsafe.getUnsafe();
         Class<?> t = Thread.class;
         try {
             THREAD_LOCALS = UNSAFE.objectFieldOffset
--- a/src/java.base/share/classes/sun/nio/ch/NativeObject.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.base/share/classes/sun/nio/ch/NativeObject.java	Thu Nov 12 16:09:09 2015 -0500
@@ -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
--- a/src/java.base/share/classes/sun/nio/ch/Util.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.base/share/classes/sun/nio/ch/Util.java	Thu Nov 12 16:09:09 2015 -0500
@@ -35,7 +35,7 @@
 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;
 
--- a/src/java.base/share/classes/sun/nio/fs/Cancellable.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.base/share/classes/sun/nio/fs/Cancellable.java	Thu Nov 12 16:09:09 2015 -0500
@@ -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;
 
 /**
--- a/src/java.base/share/classes/sun/nio/fs/NativeBuffer.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.base/share/classes/sun/nio/fs/NativeBuffer.java	Thu Nov 12 16:09:09 2015 -0500
@@ -25,7 +25,7 @@
 
 package sun.nio.fs;
 
-import sun.misc.Unsafe;
+import jdk.internal.misc.Unsafe;
 import sun.misc.Cleaner;
 
 /**
--- a/src/java.base/share/classes/sun/nio/fs/NativeBuffers.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.base/share/classes/sun/nio/fs/NativeBuffers.java	Thu Nov 12 16:09:09 2015 -0500
@@ -25,7 +25,7 @@
 
 package sun.nio.fs;
 
-import sun.misc.Unsafe;
+import jdk.internal.misc.Unsafe;
 
 /**
  * Factory for native buffers.
--- a/src/java.base/share/classes/sun/reflect/AccessorGenerator.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.base/share/classes/sun/reflect/AccessorGenerator.java	Thu Nov 12 16:09:09 2015 -0500
@@ -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 */
 
--- a/src/java.base/share/classes/sun/reflect/ClassDefiner.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.base/share/classes/sun/reflect/ClassDefiner.java	Thu Nov 12 16:09:09 2015 -0500
@@ -27,7 +27,7 @@
 
 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
--- a/src/java.base/share/classes/sun/reflect/FieldInfo.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.base/share/classes/sun/reflect/FieldInfo.java	Thu Nov 12 16:09:09 2015 -0500
@@ -38,7 +38,7 @@
     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
--- a/src/java.base/share/classes/sun/reflect/MagicAccessorImpl.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.base/share/classes/sun/reflect/MagicAccessorImpl.java	Thu Nov 12 16:09:09 2015 -0500
@@ -32,7 +32,7 @@
     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
--- a/src/java.base/share/classes/sun/reflect/ReflectionFactory.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.base/share/classes/sun/reflect/ReflectionFactory.java	Thu Nov 12 16:09:09 2015 -0500
@@ -44,7 +44,7 @@
     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 {
--- a/src/java.base/share/classes/sun/reflect/UnsafeFieldAccessorImpl.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.base/share/classes/sun/reflect/UnsafeFieldAccessorImpl.java	Thu Nov 12 16:09:09 2015 -0500
@@ -27,9 +27,9 @@
 
 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
--- a/src/java.base/share/classes/sun/reflect/UnsafeQualifiedFieldAccessorImpl.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.base/share/classes/sun/reflect/UnsafeQualifiedFieldAccessorImpl.java	Thu Nov 12 16:09:09 2015 -0500
@@ -27,10 +27,10 @@
 
 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
--- a/src/java.base/share/classes/sun/reflect/UnsafeQualifiedStaticFieldAccessorImpl.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.base/share/classes/sun/reflect/UnsafeQualifiedStaticFieldAccessorImpl.java	Thu Nov 12 16:09:09 2015 -0500
@@ -28,9 +28,9 @@
 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
--- a/src/java.base/share/classes/sun/reflect/UnsafeStaticFieldAccessorImpl.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.base/share/classes/sun/reflect/UnsafeStaticFieldAccessorImpl.java	Thu Nov 12 16:09:09 2015 -0500
@@ -28,9 +28,9 @@
 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
--- a/src/java.base/share/classes/sun/reflect/misc/ReflectUtil.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.base/share/classes/sun/reflect/misc/ReflectUtil.java	Thu Nov 12 16:09:09 2015 -0500
@@ -337,7 +337,7 @@
 
     /**
      * 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) {
--- a/src/java.base/solaris/classes/sun/nio/ch/EventPortWrapper.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.base/solaris/classes/sun/nio/ch/EventPortWrapper.java	Thu Nov 12 16:09:09 2015 -0500
@@ -31,7 +31,7 @@
 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.*;
 
--- a/src/java.base/solaris/classes/sun/nio/ch/SolarisEventPort.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.base/solaris/classes/sun/nio/ch/SolarisEventPort.java	Thu Nov 12 16:09:09 2015 -0500
@@ -28,7 +28,7 @@
 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
--- a/src/java.base/solaris/classes/sun/nio/fs/SolarisAclFileAttributeView.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.base/solaris/classes/sun/nio/fs/SolarisAclFileAttributeView.java	Thu Nov 12 16:09:09 2015 -0500
@@ -29,7 +29,7 @@
 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.*;
--- a/src/java.base/solaris/classes/sun/nio/fs/SolarisWatchService.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.base/solaris/classes/sun/nio/fs/SolarisWatchService.java	Thu Nov 12 16:09:09 2015 -0500
@@ -30,7 +30,7 @@
 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.*;
 
--- a/src/java.base/windows/classes/sun/nio/ch/Iocp.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.base/windows/classes/sun/nio/ch/Iocp.java	Thu Nov 12 16:09:09 2015 -0500
@@ -36,7 +36,7 @@
 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
--- a/src/java.base/windows/classes/sun/nio/ch/PendingIoCache.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.base/windows/classes/sun/nio/ch/PendingIoCache.java	Thu Nov 12 16:09:09 2015 -0500
@@ -27,7 +27,7 @@
 
 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
--- a/src/java.base/windows/classes/sun/nio/ch/WindowsAsynchronousServerSocketChannelImpl.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.base/windows/classes/sun/nio/ch/WindowsAsynchronousServerSocketChannelImpl.java	Thu Nov 12 16:09:09 2015 -0500
@@ -33,7 +33,7 @@
 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.
--- a/src/java.base/windows/classes/sun/nio/ch/WindowsAsynchronousSocketChannelImpl.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.base/windows/classes/sun/nio/ch/WindowsAsynchronousSocketChannelImpl.java	Thu Nov 12 16:09:09 2015 -0500
@@ -34,7 +34,7 @@
 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.
--- a/src/java.base/windows/classes/sun/nio/fs/WindowsFileAttributes.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.base/windows/classes/sun/nio/fs/WindowsFileAttributes.java	Thu Nov 12 16:09:09 2015 -0500
@@ -28,7 +28,7 @@
 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.*;
--- a/src/java.base/windows/classes/sun/nio/fs/WindowsFileSystemProvider.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.base/windows/classes/sun/nio/fs/WindowsFileSystemProvider.java	Thu Nov 12 16:09:09 2015 -0500
@@ -33,7 +33,7 @@
 import java.io.*;
 import java.util.*;
 import java.security.AccessController;
-import sun.misc.Unsafe;
+import jdk.internal.misc.Unsafe;
 import sun.nio.ch.ThreadPool;
 import sun.security.util.SecurityConstants;
 
--- a/src/java.base/windows/classes/sun/nio/fs/WindowsLinkSupport.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.base/windows/classes/sun/nio/fs/WindowsLinkSupport.java	Thu Nov 12 16:09:09 2015 -0500
@@ -30,7 +30,7 @@
 import java.io.IOError;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
-import sun.misc.Unsafe;
+import jdk.internal.misc.Unsafe;
 
 import static sun.nio.fs.WindowsNativeDispatcher.*;
 import static sun.nio.fs.WindowsConstants.*;
--- a/src/java.base/windows/classes/sun/nio/fs/WindowsNativeDispatcher.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.base/windows/classes/sun/nio/fs/WindowsNativeDispatcher.java	Thu Nov 12 16:09:09 2015 -0500
@@ -27,7 +27,7 @@
 
 import java.security.AccessController;
 import java.security.PrivilegedAction;
-import sun.misc.Unsafe;
+import jdk.internal.misc.Unsafe;
 
 /**
  * Win32 and library calls.
--- a/src/java.base/windows/classes/sun/nio/fs/WindowsSecurityDescriptor.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.base/windows/classes/sun/nio/fs/WindowsSecurityDescriptor.java	Thu Nov 12 16:09:09 2015 -0500
@@ -29,7 +29,7 @@
 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.WindowsNativeDispatcher.*;
 import static sun.nio.fs.WindowsConstants.*;
--- a/src/java.base/windows/classes/sun/nio/fs/WindowsUserDefinedFileAttributeView.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.base/windows/classes/sun/nio/fs/WindowsUserDefinedFileAttributeView.java	Thu Nov 12 16:09:09 2015 -0500
@@ -31,7 +31,7 @@
 import java.nio.channels.FileChannel;
 import java.io.IOException;
 import java.util.*;
-import sun.misc.Unsafe;
+import jdk.internal.misc.Unsafe;
 
 import static sun.nio.fs.WindowsNativeDispatcher.*;
 import static sun.nio.fs.WindowsConstants.*;
--- a/src/java.base/windows/classes/sun/nio/fs/WindowsWatchService.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.base/windows/classes/sun/nio/fs/WindowsWatchService.java	Thu Nov 12 16:09:09 2015 -0500
@@ -36,7 +36,7 @@
 import java.util.Set;
 
 import com.sun.nio.file.ExtendedWatchEventModifier;
-import sun.misc.Unsafe;
+import jdk.internal.misc.Unsafe;
 
 import static sun.nio.fs.WindowsNativeDispatcher.*;
 import static sun.nio.fs.WindowsConstants.*;
--- a/src/java.desktop/share/classes/sun/awt/AWTAccessor.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.desktop/share/classes/sun/awt/AWTAccessor.java	Thu Nov 12 16:09:09 2015 -0500
@@ -25,7 +25,7 @@
 
 package sun.awt;
 
-import sun.misc.Unsafe;
+import jdk.internal.misc.Unsafe;
 
 import javax.accessibility.AccessibleContext;
 import java.awt.*;
--- a/src/java.desktop/share/classes/sun/font/StrikeCache.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.desktop/share/classes/sun/font/StrikeCache.java	Thu Nov 12 16:09:09 2015 -0500
@@ -37,7 +37,7 @@
 import sun.java2d.pipe.BufferedContext;
 import sun.java2d.pipe.RenderQueue;
 import sun.java2d.pipe.hw.AccelGraphicsConfig;
-import sun.misc.Unsafe;
+import jdk.internal.misc.Unsafe;
 
 /**
 
--- a/src/java.desktop/share/classes/sun/java2d/pipe/RenderBuffer.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.desktop/share/classes/sun/java2d/pipe/RenderBuffer.java	Thu Nov 12 16:09:09 2015 -0500
@@ -25,7 +25,7 @@
 
 package sun.java2d.pipe;
 
-import sun.misc.Unsafe;
+import jdk.internal.misc.Unsafe;
 
 
 /**
--- a/src/java.desktop/share/classes/sun/swing/SwingAccessor.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.desktop/share/classes/sun/swing/SwingAccessor.java	Thu Nov 12 16:09:09 2015 -0500
@@ -25,7 +25,7 @@
 
 package sun.swing;
 
-import sun.misc.Unsafe;
+import jdk.internal.misc.Unsafe;
 
 import java.awt.*;
 import javax.swing.*;
--- a/src/java.desktop/unix/classes/sun/awt/X11/MotifDnDConstants.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.desktop/unix/classes/sun/awt/X11/MotifDnDConstants.java	Thu Nov 12 16:09:09 2015 -0500
@@ -31,7 +31,7 @@
 
 import java.util.Arrays;
 
-import sun.misc.Unsafe;
+import jdk.internal.misc.Unsafe;
 
 /**
  * Motif DnD protocol global constants and convenience routines.
--- a/src/java.desktop/unix/classes/sun/awt/X11/MotifDnDDragSourceProtocol.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.desktop/unix/classes/sun/awt/X11/MotifDnDDragSourceProtocol.java	Thu Nov 12 16:09:09 2015 -0500
@@ -33,7 +33,7 @@
 
 import java.util.Map;
 
-import sun.misc.Unsafe;
+import jdk.internal.misc.Unsafe;
 
 /**
  * XDragSourceProtocol implementation for Motif DnD protocol.
--- a/src/java.desktop/unix/classes/sun/awt/X11/MotifDnDDropTargetProtocol.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.desktop/unix/classes/sun/awt/X11/MotifDnDDropTargetProtocol.java	Thu Nov 12 16:09:09 2015 -0500
@@ -33,7 +33,7 @@
 
 import java.io.IOException;
 
-import sun.misc.Unsafe;
+import jdk.internal.misc.Unsafe;
 
 /**
  * XDropTargetProtocol implementation for Motif DnD protocol.
--- a/src/java.desktop/unix/classes/sun/awt/X11/Native.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.desktop/unix/classes/sun/awt/X11/Native.java	Thu Nov 12 16:09:09 2015 -0500
@@ -25,7 +25,7 @@
 
 package sun.awt.X11;
 
-import sun.misc.Unsafe;
+import jdk.internal.misc.Unsafe;
 import java.util.Vector;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
--- a/src/java.desktop/unix/classes/sun/awt/X11/UnsafeXDisposerRecord.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.desktop/unix/classes/sun/awt/X11/UnsafeXDisposerRecord.java	Thu Nov 12 16:09:09 2015 -0500
@@ -24,7 +24,7 @@
  */
 package sun.awt.X11;
 
-import sun.misc.Unsafe;
+import jdk.internal.misc.Unsafe;
 import sun.util.logging.PlatformLogger;
 
 class UnsafeXDisposerRecord implements sun.java2d.DisposerRecord {
--- a/src/java.desktop/unix/classes/sun/awt/X11/WindowPropertyGetter.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.desktop/unix/classes/sun/awt/X11/WindowPropertyGetter.java	Thu Nov 12 16:09:09 2015 -0500
@@ -26,7 +26,7 @@
 package sun.awt.X11;
 
 import java.util.*;
-import sun.misc.Unsafe;
+import jdk.internal.misc.Unsafe;
 
 public class WindowPropertyGetter {
     private static Unsafe unsafe = XlibWrapper.unsafe;
--- a/src/java.desktop/unix/classes/sun/awt/X11/XAtom.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XAtom.java	Thu Nov 12 16:09:09 2015 -0500
@@ -55,7 +55,7 @@
  * @since       1.5
  */
 
-import sun.misc.Unsafe;
+import jdk.internal.misc.Unsafe;
 import java.util.HashMap;
 
 public final class XAtom {
--- a/src/java.desktop/unix/classes/sun/awt/X11/XDnDDragSourceProtocol.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XDnDDragSourceProtocol.java	Thu Nov 12 16:09:09 2015 -0500
@@ -35,7 +35,7 @@
 
 import sun.util.logging.PlatformLogger;
 
-import sun.misc.Unsafe;
+import jdk.internal.misc.Unsafe;
 
 /**
  * XDragSourceProtocol implementation for XDnD protocol.
--- a/src/java.desktop/unix/classes/sun/awt/X11/XDnDDropTargetProtocol.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XDnDDropTargetProtocol.java	Thu Nov 12 16:09:09 2015 -0500
@@ -35,7 +35,7 @@
 
 import sun.util.logging.PlatformLogger;
 
-import sun.misc.Unsafe;
+import jdk.internal.misc.Unsafe;
 
 /**
  * XDropTargetProtocol implementation for XDnD protocol.
--- a/src/java.desktop/unix/classes/sun/awt/X11/XDropTargetContextPeer.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XDropTargetContextPeer.java	Thu Nov 12 16:09:09 2015 -0500
@@ -41,7 +41,7 @@
 import sun.awt.dnd.SunDropTargetContextPeer;
 import sun.awt.dnd.SunDropTargetEvent;
 
-import sun.misc.Unsafe;
+import jdk.internal.misc.Unsafe;
 
 /**
  * The XDropTargetContextPeer is the class responsible for handling
--- a/src/java.desktop/unix/classes/sun/awt/X11/XEmbedHelper.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XEmbedHelper.java	Thu Nov 12 16:09:09 2015 -0500
@@ -25,7 +25,7 @@
 
 package sun.awt.X11;
 
-import sun.misc.Unsafe;
+import jdk.internal.misc.Unsafe;
 
 import sun.util.logging.PlatformLogger;
 
--- a/src/java.desktop/unix/classes/sun/awt/X11/XKeysym.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XKeysym.java	Thu Nov 12 16:09:09 2015 -0500
@@ -27,7 +27,7 @@
 
 package sun.awt.X11;
 import java.util.Hashtable;
-import sun.misc.Unsafe;
+import jdk.internal.misc.Unsafe;
 
 import sun.util.logging.PlatformLogger;
 
--- a/src/java.desktop/unix/classes/sun/awt/X11/XQueryTree.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XQueryTree.java	Thu Nov 12 16:09:09 2015 -0500
@@ -27,7 +27,7 @@
 
 package sun.awt.X11;
 
-import sun.misc.Unsafe;
+import jdk.internal.misc.Unsafe;
 
 public class XQueryTree {
         private static Unsafe unsafe = XlibWrapper.unsafe;
--- a/src/java.desktop/unix/classes/sun/awt/X11/XTranslateCoordinates.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XTranslateCoordinates.java	Thu Nov 12 16:09:09 2015 -0500
@@ -27,7 +27,7 @@
 
 package sun.awt.X11;
 
-import sun.misc.Unsafe;
+import jdk.internal.misc.Unsafe;
 
 public class XTranslateCoordinates {
         private static Unsafe unsafe = XlibWrapper.unsafe;
--- a/src/java.desktop/unix/classes/sun/awt/X11/XWM.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XWM.java	Thu Nov 12 16:09:09 2015 -0500
@@ -31,7 +31,7 @@
 package sun.awt.X11;
 
 import sun.awt.IconInfo;
-import sun.misc.Unsafe;
+import jdk.internal.misc.Unsafe;
 import java.awt.Insets;
 import java.awt.Frame;
 import java.awt.Rectangle;
--- a/src/java.desktop/unix/classes/sun/awt/X11/XlibWrapper.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.desktop/unix/classes/sun/awt/X11/XlibWrapper.java	Thu Nov 12 16:09:09 2015 -0500
@@ -27,7 +27,7 @@
 
 import java.security.AccessController;
 
-import sun.misc.Unsafe;
+import jdk.internal.misc.Unsafe;
 import sun.security.action.GetPropertyAction;
 
 final class XlibWrapper {
--- a/src/java.desktop/unix/classes/sun/awt/X11/keysym2ucs.h	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.desktop/unix/classes/sun/awt/X11/keysym2ucs.h	Thu Nov 12 16:09:09 2015 -0500
@@ -65,7 +65,7 @@
 tojava
 tojava package sun.awt.X11;
 tojava import java.util.Hashtable;
-tojava import sun.misc.Unsafe;
+tojava import jdk.internal.misc.Unsafe;
 tojava
 tojava import sun.util.logging.PlatformLogger;
 tojava
--- a/src/java.management/share/classes/sun/management/BaseOperatingSystemImpl.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.management/share/classes/sun/management/BaseOperatingSystemImpl.java	Thu Nov 12 16:09:09 2015 -0500
@@ -28,7 +28,7 @@
 import java.lang.management.OperatingSystemMXBean;
 import java.lang.management.ManagementFactory;
 import javax.management.ObjectName;
-import sun.misc.Unsafe;
+import jdk.internal.misc.Unsafe;
 
 /**
  * Implementation class for the operating system.
--- a/src/java.management/share/classes/sun/management/ManagementFactoryHelper.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.management/share/classes/sun/management/ManagementFactoryHelper.java	Thu Nov 12 16:09:09 2015 -0500
@@ -51,7 +51,7 @@
     static {
         // make sure that the management lib is loaded within
         // java.lang.management.ManagementFactory
-        sun.misc.Unsafe.getUnsafe().ensureClassInitialized(ManagementFactory.class);
+        jdk.internal.misc.Unsafe.getUnsafe().ensureClassInitialized(ManagementFactory.class);
     }
 
     private static final VMManagement jvm = new VMManagementImpl();
--- a/src/java.security.jgss/share/classes/sun/security/krb5/KerberosSecrets.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.security.jgss/share/classes/sun/security/krb5/KerberosSecrets.java	Thu Nov 12 16:09:09 2015 -0500
@@ -26,7 +26,7 @@
 package sun.security.krb5;
 
 import javax.security.auth.kerberos.KeyTab;
-import sun.misc.Unsafe;
+import jdk.internal.misc.Unsafe;
 
 public class KerberosSecrets {
     private static final Unsafe unsafe = Unsafe.getUnsafe();
--- a/src/java.security.jgss/share/classes/sun/security/krb5/PrincipalName.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/src/java.security.jgss/share/classes/sun/security/krb5/PrincipalName.java	Thu Nov 12 16:09:09 2015 -0500
@@ -187,10 +187,10 @@
     }
 
     private static final long NAME_STRINGS_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();
             NAME_STRINGS_OFFSET = unsafe.objectFieldOffset(
                     PrincipalName.class.getDeclaredField("nameStrings"));
             UNSAFE = unsafe;
--- a/test/com/sun/jndi/ldap/LdapTimeoutTest.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/test/com/sun/jndi/ldap/LdapTimeoutTest.java	Thu Nov 12 16:09:09 2015 -0500
@@ -47,6 +47,7 @@
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeoutException;
 import java.util.concurrent.TimeUnit;
+import javax.net.ssl.SSLHandshakeException;
 
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import static java.util.concurrent.TimeUnit.NANOSECONDS;
@@ -234,6 +235,12 @@
         if (e.getCause() instanceof SocketTimeoutException) {
             // SSL connect will timeout via readReply using
             // SocketTimeoutException
+            e.printStackTrace();
+            pass();
+        } else if (e.getCause() instanceof SSLHandshakeException
+                && e.getCause().getCause() instanceof EOFException) {
+            // test seems to be failing intermittently on some
+            // platforms.
             pass();
         } else {
             fail(e);
--- a/test/java/time/tck/java/time/format/TCKZoneIdPrinterParser.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/test/java/time/tck/java/time/format/TCKZoneIdPrinterParser.java	Thu Nov 12 16:09:09 2015 -0500
@@ -156,6 +156,7 @@
                 {"UTC", 3, -1, ZoneId.of("UTC"), false},
                 {"UT", 2, -1, ZoneId.of("UT"), false},
                 {"GMT", 3, -1, ZoneId.of("GMT"), false},
+                {"GMT0", 4, -1, ZoneId.of("GMT0"), false},
 
                 {"+00:00", 6, -1, ZoneOffset.UTC, true},
                 {"UTC+00:00", 9, -1, ZoneId.of("UTC"), false},
--- a/test/java/time/test/java/time/temporal/TestIsoWeekFields.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/test/java/time/test/java/time/temporal/TestIsoWeekFields.java	Thu Nov 12 16:09:09 2015 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014,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
@@ -121,6 +121,14 @@
         assertEquals(IsoFields.WEEK_BASED_YEAR.isSupportedBy(ThaiBuddhistDate.now()), false);
     }
 
+    @Test
+    public void test_Unit_isSupportedBy_ISO() {
+        assertEquals(IsoFields.WEEK_BASED_YEARS.isSupportedBy(LocalDate.now()),true);
+        assertEquals(IsoFields.WEEK_BASED_YEARS.isSupportedBy(ThaiBuddhistDate.now()),false);
+        assertEquals(IsoFields.QUARTER_YEARS.isSupportedBy(LocalDate.now()),true);
+        assertEquals(IsoFields.QUARTER_YEARS.isSupportedBy(ThaiBuddhistDate.now()),false);
+    }
+
     @Test(dataProvider = "fields")
     public void test_WBY_range(TemporalField weekField, TemporalField yearField) {
         assertEquals(yearField.range(), ValueRange.of(Year.MIN_VALUE, Year.MAX_VALUE));
--- a/test/java/util/Objects/BasicObjectsTest.java	Thu Nov 12 16:07:14 2015 -0500
+++ b/test/java/util/Objects/BasicObjectsTest.java	Thu Nov 12 16:09:09 2015 -0500
@@ -241,12 +241,12 @@
         String nonNullString = "non-null";
 
         // Confirm the compile time return type matches
-        String result = Objects.nonNullElse(nullString, defString);
+        String result = Objects.requireNonNullElse(nullString, defString);
         errors += (result == defString) ? 0 : 1;
-        errors += (Objects.nonNullElse(nonNullString, defString) == nonNullString) ? 0 : 1;
-        errors += (Objects.nonNullElse(nonNullString, null) == nonNullString) ? 0 : 1;
+        errors += (Objects.requireNonNullElse(nonNullString, defString) == nonNullString) ? 0 : 1;
+        errors += (Objects.requireNonNullElse(nonNullString, null) == nonNullString) ? 0 : 1;
         try {
-            Objects.nonNullElse(null, null);
+            Objects.requireNonNullElse(null, null);
             errors += 1;
         } catch (NullPointerException npe) {
             // expected
@@ -254,20 +254,20 @@
         }
 
 
-        // Test nonNullElseGet with a supplier
-        errors += (Objects.nonNullElseGet(nullString, () -> defString) == defString) ? 0 : 1;
-        errors += (Objects.nonNullElseGet(nonNullString, () -> defString) == nonNullString) ? 0 : 1;
-        errors += (Objects.nonNullElseGet(nonNullString, () -> null) == nonNullString) ? 0 : 1;
+        // Test requireNonNullElseGet with a supplier
+        errors += (Objects.requireNonNullElseGet(nullString, () -> defString) == defString) ? 0 : 1;
+        errors += (Objects.requireNonNullElseGet(nonNullString, () -> defString) == nonNullString) ? 0 : 1;
+        errors += (Objects.requireNonNullElseGet(nonNullString, () -> null) == nonNullString) ? 0 : 1;
 
         try {
-            Objects.nonNullElseGet(null, () -> null);
+            Objects.requireNonNullElseGet(null, () -> null);
             errors += 1;
         } catch (NullPointerException npe) {
             // expected
             errors += npe.getMessage().equals("supplier.get()") ? 0 : 1;
         }
         try {       // supplier is null
-            Objects.nonNullElseGet(null, null);
+            Objects.requireNonNullElseGet(null, null);
             errors += 1;
         } catch (NullPointerException npe) {
             // expected
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/sun/security/jca/PreferredProviderNegativeTest.java	Thu Nov 12 16:09:09 2015 -0500
@@ -0,0 +1,130 @@
+/*
+ * Copyright (c) 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test
+ * @bug 8076359 8133151
+ * @summary Test for jdk.security.provider.preferred security property
+ * @requires os.name == "SunOS"
+ * @run main/othervm  PreferredProviderNegativeTest preJCESet AES:OracleUcrypto false
+ * @run main/othervm  PreferredProviderNegativeTest preJCESet AES:SunNegative true
+ * @run main/othervm  PreferredProviderNegativeTest afterJCESet AES:SunJGSS
+ * @run main/othervm  PreferredProviderNegativeTest afterJCESet AES:SunECNegative
+ * @run main/othervm  PreferredProviderNegativeTest invalidAlg AESNegative:SunJCE
+ */
+
+import java.security.Security;
+import java.security.NoSuchAlgorithmException;
+import javax.crypto.Cipher;
+import javax.crypto.NoSuchPaddingException;
+
+public class PreferredProviderNegativeTest {
+
+    /*
+     * Test security property could be set by valid and invalid provider
+     * before JCE was loaded
+     */
+    public static void preJCESet(String value, boolean negativeProvider)
+            throws NoSuchAlgorithmException, NoSuchPaddingException {
+        Security.setProperty("jdk.security.provider.preferred", value);
+
+        if (!Security.getProperty("jdk.security.provider.preferred")
+                .equals(value)) {
+            throw new RuntimeException(
+                    "Test Failed:The property wasn't set");
+        }
+
+        String[] arrays = value.split(":");
+        Cipher cipher = Cipher.getInstance(arrays[0]);
+
+        if (negativeProvider) {
+            if (cipher.getProvider().getName().equals(arrays[1])) {
+                throw new RuntimeException(
+                        "Test Failed:The provider shouldn't be set");
+            }
+        } else {
+            if (!cipher.getProvider().getName().equals(arrays[1])) {
+                throw new RuntimeException(
+                        "Test Faild:The provider could be set "
+                                + "by valid provider ");
+            }
+        }
+        System.out.println("Test Pass");
+    }
+
+    /*
+     * Test that the setting of the security property after Cipher.getInstance()
+     * does not influence previously loaded instances
+     */
+    public static void afterJCESet(String value)
+            throws NoSuchAlgorithmException, NoSuchPaddingException {
+        String[] arrays = value.split(":");
+        Cipher cipher = Cipher.getInstance(arrays[0]);
+
+        Security.setProperty("jdk.security.provider.preferred", value);
+        if (!cipher.getProvider().getName().equals("SunJCE")) {
+            throw new RuntimeException(
+                    "Test Failed:The security property can't be updated after JCE load.");
+        }
+        System.out.println("Test Pass");
+    }
+
+    /* Test the security property with negative algorithm */
+    public static void invalidAlg(String value) throws NoSuchPaddingException {
+        String[] arrays = value.split(":");
+
+        try {
+            Security.setProperty("jdk.security.provider.preferred", value);
+            Cipher.getInstance(arrays[0]);
+        } catch (NoSuchAlgorithmException e) {
+            System.out.println("Test Pass:Got NoSuchAlgorithmException as expired");
+            return;
+        }
+        throw new RuntimeException(
+                "Test Failed:Expected NoSuchAlgorithmException was not thrown");
+    }
+
+    public static void main(String[] args)
+            throws NoSuchAlgorithmException, NoSuchPaddingException {
+        boolean negativeProvider;
+
+        if (args.length >= 2) {
+            switch (args[0]) {
+                case "preJCESet":
+                    negativeProvider = Boolean.valueOf(args[2]);
+                    PreferredProviderNegativeTest.preJCESet(args[1], negativeProvider);
+                    break;
+                case "afterJCESet":
+                    PreferredProviderNegativeTest.afterJCESet(args[1]);
+                    break;
+                case "invalidAlg":
+                    PreferredProviderNegativeTest.invalidAlg(args[1]);
+                    break;
+            }
+        } else {
+            throw new RuntimeException(
+                    "Test Failed:Please pass the correct args");
+        }
+    }
+}
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/sun/security/jca/PreferredProviderTest.java	Thu Nov 12 16:09:09 2015 -0500
@@ -0,0 +1,131 @@
+/*
+ * Copyright (c) 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test
+ * @bug 8076359 8133151
+ * @summary Test the value for new jdk.security.provider.preferred security property
+ * @requires os.name == "SunOS"
+ */
+
+import java.security.KeyFactory;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.security.Security;
+import java.util.Arrays;
+import java.util.List;
+import javax.crypto.Cipher;
+import javax.crypto.NoSuchPaddingException;
+
+public class PreferredProviderTest {
+
+    private static final List<DataTuple> SPARC_DATA = Arrays.asList(
+            new DataTuple("SHA-256", "SUN"), new DataTuple("SHA-384", "SUN"),
+            new DataTuple("SHA-512", "SUN"));
+    private static final List<DataTuple> X86_DATA = Arrays
+            .asList(new DataTuple("RSA", "SunRsaSign"));
+
+    public void RunTest(String type)
+            throws NoSuchAlgorithmException, NoSuchPaddingException {
+        String preferredProvider = Security
+                .getProperty("jdk.security.provider.preferred");
+        String actualProvider = null;
+        if (type.equals("sparcv9")) {
+            if (!preferredProvider.equals(
+                    "AES:SunJCE, SHA-256:SUN, SHA-384:SUN, SHA-512:SUN")) {
+                throw new RuntimeException(
+                        "Test Failed: wrong jdk.security.provider.preferred "
+                                + "value on solaris-sparcv9");
+            }
+            for (DataTuple dataTuple : SPARC_DATA) {
+                MessageDigest md = MessageDigest
+                        .getInstance(dataTuple.algorithm);
+                actualProvider = md.getProvider().getName();
+                if (!actualProvider.equals(dataTuple.provider)) {
+                    throw new RuntimeException(String.format(
+                            "Test Failed:Got wrong "
+                                    + "provider from Solaris-sparcv9 platform,"
+                                    + "Expected Provider: %s, Returned Provider: %s",
+                            dataTuple.provider, actualProvider));
+                }
+            }
+        } else if (type.equals("amd64")) {
+            if (!preferredProvider.equals("AES:SunJCE, RSA:SunRsaSign")) {
+                throw new RuntimeException(
+                        "Test Failed: wrong jdk.security.provider.preferred "
+                                + "value on solaris-x86");
+            }
+            for (DataTuple dataTuple : X86_DATA) {
+                KeyFactory keyFactory = KeyFactory
+                        .getInstance(dataTuple.algorithm);
+                actualProvider = keyFactory.getProvider().getName();
+                if (!actualProvider.equals(dataTuple.provider)) {
+                    throw new RuntimeException(String.format(
+                            "Test Failed:Got wrong "
+                                    + "provider from Solaris-x86 platform,"
+                                    + "Expected Provider: %s, Returned Provider: %s",
+                            dataTuple.provider, actualProvider));
+                }
+            }
+        } else {
+            throw new RuntimeException("Test Failed: wrong platform value");
+        }
+
+        Cipher cipher = Cipher.getInstance("AES/GCM/NoPadding");
+        actualProvider = cipher.getProvider().getName();
+        if (!actualProvider.equals("SunJCE")) {
+            throw new RuntimeException(String.format(
+                    "Test Failed:Got wrong provider from Solaris-%s platform, "
+                            + "Expected Provider: SunJCE, Returned Provider: %s",
+                    type, actualProvider));
+        }
+
+        MessageDigest md = MessageDigest.getInstance("MD5");
+        actualProvider = md.getProvider().getName();
+        if (!actualProvider.equals("OracleUcrypto")) {
+            throw new RuntimeException(String.format(
+                    "Test Failed:Got wrong provider from Solaris-%s platform,"
+                            + "Expected Provider: OracleUcrypto, Returned Provider: %s",
+                    type, actualProvider));
+        }
+    }
+
+    private static class DataTuple {
+        private final String provider;
+        private final String algorithm;
+
+        private DataTuple(String algorithm, String provider) {
+            this.algorithm = algorithm;
+            this.provider = provider;
+        }
+    }
+
+    public static void main(String[] args)
+            throws NoSuchAlgorithmException, NoSuchPaddingException {
+
+        String arch = System.getProperty("os.arch");
+        PreferredProviderTest pp = new PreferredProviderTest();
+        pp.RunTest(arch);
+    }
+}
+