--- a/ChangeLog	Fri Dec 20 11:29:32 2013 +0100
+++ b/ChangeLog	Thu Dec 26 23:17:45 2013 +0000
@@ -1,3 +1,34 @@
+2013-12-26  Andrew John Hughes  <gnu.andrew@member.fsf.org>
+
+	* Makefile.am:
+	(BUILD_VERSION): Bump to b02.
+	(CORBA_CHANGESET): Update to current HEAD.
+	(JAXP_CHANGESET): Likewise.
+	(JAXWS_CHANGESET): Likewise.
+	(JDK_CHANGESET): Likewise.
+	(LANGTOOLS_CHANGESET): Likewise.
+	(OPENJDK_CHANGESET): Likewise.
+	(CORBA_SHA256SUM): Likewise.
+	(JAXP_SHA256SUM): Likewise.
+	(JAXWS_SHA256SUM): Likewise.
+	(JDK_SHA256SUM): Likewise.
+	(LANGTOOLS_SHA256SUM): Likewise.
+	(OPENJDK_SHA256SUM): Likewise.
+	* NEWS: Add changes brought in and fix
+	formatting.
+	* hotspot.map: Sync with forest HEAD.
+	* patches/boot/break-processbuilder-dependency.patch:
+	Regenerated.
+	* patches/boot/ecj-diamond.patch:
+	Regenerated.  Add new cases in com.sun.beans.util.Cache
+	and java.lang.reflect.WeakCache. Drop ThreadGroupContext
+	changes as no longer needed.
+	* patches/boot/ecj-multicatch.patch:
+	Add new case in java.nio.charset.Charset.
+	* patches/boot/ecj-stringswitch.patch:
+	Update MethodHandleNatives change to include getDeclaringClass
+	and getInvocationHandler.
+
 2013-12-20  Xerxes Rånby  <xerxes@zafena.se>
 	    Robert Lougher  <rob@jamvm.org.uk>
 

--- a/Makefile.am	Fri Dec 20 11:29:32 2013 +0100
+++ b/Makefile.am	Thu Dec 26 23:17:45 2013 +0000
@@ -1,22 +1,22 @@
 # Dependencies
 
 JDK_UPDATE_VERSION = 60
-BUILD_VERSION = b00
+BUILD_VERSION = b02
 COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(BUILD_VERSION)
 
-CORBA_CHANGESET = e5da8ecaf6f9
-JAXP_CHANGESET = fc76c585e6c5
-JAXWS_CHANGESET = b28455339003
-JDK_CHANGESET = 0ff397456868
-LANGTOOLS_CHANGESET = db375fd08fa3
-OPENJDK_CHANGESET = 51c1d39f82ae
+CORBA_CHANGESET = 5ec8983b8223
+JAXP_CHANGESET = 2d65c7260575
+JAXWS_CHANGESET = bd85f1c0b8a1
+JDK_CHANGESET = 4c27cda21c4a
+LANGTOOLS_CHANGESET = c271c79d6a8c
+OPENJDK_CHANGESET = 77e89f3f9031
 
-CORBA_SHA256SUM = d8c4e9792352a40011e8bc4bd302d94cbd12cf63d50d4edb3396724474d5c0d5
-JAXP_SHA256SUM = 35210f1d5cd741504310dbd5eb848735a8bd66157d3d9c5caa507c8fc65fcf3c
-JAXWS_SHA256SUM = d7e47d15ae3d7a9db53e72ad597ea52d2c76a8c49827b36c789424177c727c25
-JDK_SHA256SUM = b95568aa9665865b7c74a0a42bb7531b3808d7b6ae4347501c190cc76373b3c9
-LANGTOOLS_SHA256SUM = cf5962e23bf093ccfd9318e07d9fe19ce0da6026af740229f6ec90900f27073e
-OPENJDK_SHA256SUM = 785d4ad0a1dddd831c5fc315949dc9602e482bb2265a4dd6704ec3766237bed6
+CORBA_SHA256SUM = 6c9a83e473ec409a59da9c04a578f7d0ad3322e5a938216eaa0e8d8d930eceb0
+JAXP_SHA256SUM = a8577172a84a44d108f036872adb18f2c06fdc59ae401161c9159f391ef9734a
+JAXWS_SHA256SUM = b80f3c5319f2ff11bc8548c13711ffaf93de30ea5ca98468663e70fc7fbdd708
+JDK_SHA256SUM = b2c45af6da2815f85b80699e51de748924709d295e5b0d951a47bb94a4c808cd
+LANGTOOLS_SHA256SUM = dccb8f490338b3d0808cb647acea48c60839145d61bd7cca6bc1fce42eba86ed
+OPENJDK_SHA256SUM = 495d501b3f5769000bac4ca732b9a772c95a3ad0c3a390926d02302579351dc7
 
 CACAO_VERSION = e215e36be9fc
 CACAO_SHA256SUM = 4966514c72ee7ed108b882d9b6e65c3adf8a8f9c2dccb029f971b3c8cb4870ab

--- a/NEWS	Fri Dec 20 11:29:32 2013 +0100
+++ b/NEWS	Thu Dec 26 23:17:45 2013 +0000
@@ -14,18 +14,114 @@
 
 New in release 2.5.0 (2013-XX-XX):
 
+* OpenJDK
+  - S5049299: (process) Use posix_spawn, not fork, on S10 to avoid swap exhaustion
+  - S6889597: TEST_BUG: javax/management/remote/mandatory/URLTest.java test should be updated in jdk7 Workspace
+  - S6900441: PlatformEvent.park(millis) on Linux could still be affected by changes to the time-of-day clock
+  - S6989981: jstack causes "fatal error: ExceptionMark destructor expects no pending exceptions"
+  - S7123493: (proxy) Proxy.getProxyClass doesn't scale under high load
+  - S7124232: [TEST_BUG] [macosx] JSplitPane has wrong divider location
+  - S7124314: [TEST_BUG] [macosx] Aqua LAF: JTree doesn't select element by keyboards left and right keys
+  - S7124320: [TEST_BUG] [macosx] JComboBox doesn't change selection on mouse over
+  - S7124338: [macosx] Selection lost if a selected item removed from a java.awt.List
+  - S7129133: [macosx] Accelerators are displayed as Meta instead of the Command symbol
+  - S7133122: SA throws sun.jvm.hotspot.debugger.UnmappedAddressException when it should not
+  - S7133146: [macosx] closed/javax/swing/JInternalFrame/4193219/IconCoord fails on MacOS
+  - S7133154: [TEST_BUG] [macosx] closed/javax/swing/JInternalFrame/4251301/bug4251301.java fails on MacOS
+  - S7147084: (process) appA hangs when read output stream of appB which starts appC that runs forever
+  - S7171591: getDefaultScopeID() in src/solaris/native/java/net/net_util_md.c should return a value
+  - S7173464: Clipboard.getAvailableDataFlavors: Comparison method violates contract
+  - S7197210: java/lang/invoke/CallSiteTest.java failing on armsflt.
+  - S8003262: reverse translation required changes in xalan resource bundles
+  - S8004032: [TEST_BUG] [macosx] There is no effect when double clicking on the Icon, after right clicking on the Icon and the Icon disappear
+  - S8004051: assert(_oprs_len[mode] < maxNumberOfOperands) failed: array overflow
+  - S8004476: XSLT Extension Functions Don't Work in WebStart
+  - S8006395: Race in async socket close on Linux
+  - S8007454: (process) SetHandleInformation parameters DWORD (not BOOLEAN)
+  - S8008118: (process) Possible null pointer dereference in jdk/src/solaris/native/java/lang/UNIXProcess_md.c
+  - S8008733: Psr:perf:osb performance regression (18%) in wss_bodyenc
+  - S8009213: sun/management/jdp/JdpTest.sh fails with exit code 1
+  - S8012326: Deadlock occurs when Charset.availableCharsets() is called by several threads at the same time
+  - S8012615: Realm.getRealmsList returns realms list in wrong
+  - S8012925: [parfait] Missing return value in jdk/src/macosx/native/sun/awt/AWTEvent.m
+  - S8015092: SchemaFactory cannot parse schema if whitespace added within patterns in Selector XPath expression
+  - S8015243: SchemaFactory does not catch enum. value that is not in the value space of the base type, anyURI
+  - S8015599: [TEST_BUG] [macosx] Test closed/javax/swing/Popup/TaskbarPositionTest.java fails since JDK 8 b75 on MacOSX
+  - S8015600: [TEST_BUG] [macosx] Test closed/javax/swing/plaf/basic/BasicMenuUI/4983388/bug4983388.java fails since JDK 8 b75 on MacOSX
+  - S8016018: Typo in AbstractStringBuilder#indexOf and #lastIndexOf descriptions
+  - S8016271: wsimport -clientjar does not create portable jars on Windows due to hardcoded backslash
+  - S8016500: Unlocalized warnings.
+  - S8017180: [macosx] [TEST_BUG] alt-key doesn't work on macos for menu
+  - S8017195: Introduce option to setKeepAlive parameter on CORBA sockets
+  - S8019396: SA-JDI: OSThread class initialization throws an exception
+  - S8021257: com.sun.corba.se.** should be on restricted package list
+  - S8021898: Broken JIT compiler optimization for loop unswitching
+  - S8021943: FileDialog getFile returns corrupted string after previous setFile
+  - S8022507: SIGSEGV at ParMarkBitMap::verify_clear()
+  - S8022584: Memory leak in some NetworkInterface methods
+  - S8022585: VM crashes when ran with -XX:+PrintInlining
+  - S8022993: Convert MAX_UNROLL constant to LoopMaxUnroll C2 flag
+  - S8023130: (process) ProcessBuilder#inheritIO does not work on Windows
+  - S8023310: Thread contention in the method Beans.IsDesignTime()
+  - S8023472: C2 optimization breaks with G1
+  - S8023580: Add jtreg test for 8004051 and 8005722
+  - S8023720: (hotspot) setjmp/longjmp changes the process signal mask on OS X
+  - S8023786: (jdk) setjmp/longjmp changes the process signal mask on OS X
+  - S8024027: Test sun/misc/IoTrace/IoTraceSocketReadWrite.java crashes VM
+  - S8024163: [macosx] NullPointerException at javax.swing.TransferHandler$DropHandler.handleDrag since jdk8b93, 7u40b28
+  - S8024461: [macosx] Java crashed on mac10.9 for swing and 2d function manual test
+  - S8024521: (process) Async close issues with Process InputStream
+  - S8024707: TransformerException : item() return null with node list of length != 1
+  - S8024830: SEGV in org.apache.lucene.codecs.compressing.CompressingTermVectorsReader.get
+  - S8024861: Incomplete token triggers GSS-API NullPointerException
+  - S8024876: [TEST_BUG] javax/xml/jaxp/parsers/8022548/XOMParserTest.java failed when testbase dir has read only permissions
+  - S8024952: ClassCastException in PlainSocketImpl.accept() when using custom socketImpl
+  - S8025145: [macosx]: java 7 does not recognize tiff image on clipboard
+  - S8025204: Intermittent test failure: javax/management/remote/mandatory/connection/IdleTimeoutTest.java
+  - S8025205: Intermittent test failure: javax/management/remote/mandatory/connection/BrokenConnectionTest.java
+  - S8025206: Intermittent test failure:     javax/management/monitor/NullAttributeValueTest.java
+  - S8025207: Intermittent test failure: javax/management/monitor/CounterMonitorThresholdTest.java
+  - S8025255: (tz) Support tzdata2013g
+  - S8025512: NPE with logging while launching webstart on jre7u40 if logging is disabled
+  - S8025713: Syncing indendation/comment/copyright year differences with upstream projects
+  - S8025860: new hotspot build - hs24.60-b02
+  - S8025861: Set minor version for hotspot in 7u60 to 60 and build number to b01
+  - S8025920: webrev.ksh does not provide any details about changes in zip files
+  - S8026293: Schedule part of G1 pre-barrier late
+  - S8026486: Significant slowdown due to transparent huge pages
+  - S8026502: java/lang/invoke/MethodHandleConstants.java fails on all platforms
+  - S8026794: Test tools/pack200/TimeStamp.java fails while opening golden.jar.native.IST on linux-ppc(v2)
+  - S8027066: XMLDecoder in java 7 cannot properly deserialize object arrays
+  - S8027172: new hotspot build - hs24.60-b03
+  - S8027426: String.toLowerCase incorrectly increases length, if string contains \u0130 char
+  - S8027579: new hotspot build - hs24.60-b04
+  - S8027837: JDK-8021257 causes CORBA build failure on emdedded platforms
+  - S8027839: C1 crashes in Weblogic with G1 enabled
+  - S8027840: C2 allows safepoint checks to leak into G1 pre-barriers
+  - S8027860: [TEST_BUG] File not closed in javax/xml/jaxp/parsers/8022548/XOMParserTest.java
+  - S8027997: G1: SPECjbb2013 crashes due to a broken object reference
+  - S8028054: com.sun.beans.finder.MethodFinder has unsynchronized access to a static Map
+  - S8028215: ORB.init fails with SecurityException if properties select the JDK default ORB
+  - S8028351: JWS doesn't get authenticated when using kerberos auth proxy
+  - S8028412: AsyncGetCallTrace() is broken on x86 in JDK 7u40
+  - S8029304: JFR broken in 7u train for JDK Linux for ARM or OpenJDK
+  - S8029599: JVM crashes on solaris-i586 with -Xverify:all if stack overflow happens during recursive reflective call
 * Bug fixes
- - Fix implicit function declarations
- - PR1617: Include defs.make in vm.make so zeroshark.make is included
+  - Fix implicit function declarations
+  - PR1617: Include defs.make in vm.make so zeroshark.make is included
+  - Add Shark definitions from 8003868
+  - D729448: 32-bit alignment on mips and mipsel
+  - Drop compile_method argument removed in 7083786 from sharkCompiler.cpp
+  - Remove binary files and unlicensed generated files
 * JamVM
   - JVM_NewMultiArray: element class may be an array
   - jtreg test java/lang/reflect/Array/ExceedMaxDim
   - OpenJDK: Fix Local/Anonymous class checks
   - classlibMarkThreadTerminated should return Object*
   - Fix race-condition in constant-pool resolution code
-  - JSR 292: MethodHandle constant-pool refs may be resolved
-  - JSR 292: bootstrap method args error handling
-  - JSR 292: correct intrinsic cache COMPARE function
+  - JSR292: MethodHandle constant-pool refs may be resolved
+  - JSR292: bootstrap method args error handling
+  - JSR292: correct intrinsic cache COMPARE function
   - Race condition in setting up imethod table
   - GC: Minor performance improvement
 

--- a/hotspot.map	Fri Dec 20 11:29:32 2013 +0100
+++ b/hotspot.map	Thu Dec 26 23:17:45 2013 +0000
@@ -1,2 +1,2 @@
 # version url changeset sha256sum
-default http://icedtea.classpath.org/hg/icedtea7-forest/hotspot 9d01164b2dfc 0c0db223f315b31431a802d5f6b7f76d980c4c72eeff680bb1964187b66dd835
+default http://icedtea.classpath.org/hg/icedtea7-forest/hotspot 11e724b1a33d 68edff4b613f9013f6c4779e1712512d02fc24886a53a69f35fa7e9313fce58b

--- a/patches/boot/break-processbuilder-dependency.patch	Fri Dec 20 11:29:32 2013 +0100
+++ b/patches/boot/break-processbuilder-dependency.patch	Thu Dec 26 23:17:45 2013 +0000
@@ -1,9 +1,9 @@
 diff -Nru openjdk-boot.orig/jdk/src/solaris/classes/java/lang/UNIXProcess.java.linux openjdk-boot/jdk/src/solaris/classes/java/lang/UNIXProcess.java.linux
---- openjdk-boot.orig/jdk/src/solaris/classes/java/lang/UNIXProcess.java.linux	2010-09-01 22:21:08.815402468 +0100
-+++ openjdk-boot/jdk/src/solaris/classes/java/lang/UNIXProcess.java.linux	2010-09-01 22:23:19.572081778 +0100
-@@ -62,6 +62,32 @@
-     private /* final */ InputStream  stdout;
-     private /* final */ InputStream  stderr;
+--- openjdk-boot.orig/jdk/src/solaris/classes/java/lang/UNIXProcess.java.linux	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/solaris/classes/java/lang/UNIXProcess.java.linux	2013-12-26 22:11:52.199802211 +0000
+@@ -109,6 +109,32 @@
+         });
+     }
  
 +    /**
 +     * Required package-private classes taken from
@@ -34,7 +34,7 @@
      /* this is for the reaping thread */
      private native int waitForProcessExit(int pid);
  
-@@ -155,15 +181,15 @@
+@@ -211,15 +237,15 @@
  
      void initStreams(int[] fds) throws IOException {
          stdin = (fds[0] == -1) ?
@@ -53,16 +53,16 @@
              new ProcessPipeInputStream(fds[2]);
  
          processReaperExecutor.execute(new Runnable() {
-@@ -275,7 +301,7 @@
-                     byte[] stragglers = drainInputStream(in);
-                     in.close();
-                     this.in = (stragglers == null) ?
--                        ProcessBuilder.NullInputStream.INSTANCE :
-+                        NullInputStream.INSTANCE :
-                         new ByteArrayInputStream(stragglers);
-                     if (buf == null) // asynchronous close()?
-                         this.in = null;
-@@ -306,7 +332,7 @@
+@@ -331,7 +357,7 @@
+                 }
+             }
+             return (a == null) ?
+-                    ProcessBuilder.NullInputStream.INSTANCE :
++                    NullInputStream.INSTANCE :
+                     new ByteArrayInputStream(n == a.length ? a : Arrays.copyOf(a, n));
+         }
+ 
+@@ -377,7 +403,7 @@
                      // We know of no reason to get an IOException, but if
                      // we do, there's nothing else to do but carry on.
                  }
@@ -72,11 +72,11 @@
          }
      }
 diff -Nru openjdk-boot.orig/jdk/src/solaris/classes/java/lang/UNIXProcess.java.solaris openjdk-boot/jdk/src/solaris/classes/java/lang/UNIXProcess.java.solaris
---- openjdk-boot.orig/jdk/src/solaris/classes/java/lang/UNIXProcess.java.solaris	2010-09-01 22:21:08.815402468 +0100
-+++ openjdk-boot/jdk/src/solaris/classes/java/lang/UNIXProcess.java.solaris	2010-09-01 22:22:33.204096111 +0100
-@@ -45,6 +45,32 @@
-     private DeferredCloseInputStream stdout_inner_stream;
-     private InputStream stderr_stream;
+--- openjdk-boot.orig/jdk/src/solaris/classes/java/lang/UNIXProcess.java.solaris	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/solaris/classes/java/lang/UNIXProcess.java.solaris	2013-12-26 22:12:18.024196383 +0000
+@@ -98,6 +98,32 @@
+         });
+     }
  
 +    /**
 +     * Required package-private classes taken from
@@ -107,7 +107,7 @@
      /* this is for the reaping thread */
      private native int waitForProcessExit(int pid);
  
-@@ -86,7 +112,7 @@
+@@ -145,7 +171,7 @@
          java.security.AccessController.doPrivileged(
          new java.security.PrivilegedAction<Void>() { public Void run() {
              if (std_fds[0] == -1)
@@ -116,7 +116,7 @@
              else {
                  FileDescriptor stdin_fd = new FileDescriptor();
                  fdAccess.set(stdin_fd, std_fds[0]);
-@@ -95,7 +121,7 @@
+@@ -154,7 +180,7 @@
              }
  
              if (std_fds[1] == -1)
@@ -125,7 +125,7 @@
              else {
                  FileDescriptor stdout_fd = new FileDescriptor();
                  fdAccess.set(stdout_fd, std_fds[1]);
-@@ -104,7 +130,7 @@
+@@ -163,7 +189,7 @@
              }
  
              if (std_fds[2] == -1)

--- a/patches/boot/ecj-diamond.patch	Fri Dec 20 11:29:32 2013 +0100
+++ b/patches/boot/ecj-diamond.patch	Thu Dec 26 23:17:45 2013 +0000
@@ -1,6 +1,6 @@
 diff -Nru openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java
---- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java	2012-07-09 23:52:39.000000000 +0100
-+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java	2013-09-20 00:33:52.220645499 +0100
+--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java	2013-12-26 19:50:41.000000000 +0000
++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java	2013-12-26 22:23:06.678103309 +0000
 @@ -58,7 +58,7 @@
      private CorbaConnection conn;
  
@@ -11,8 +11,8 @@
      public static synchronized void cleanCache( ORB orb ) {
          synchronized (iorMapLock) {
 diff -Nru openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java
---- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java	2013-07-08 21:17:14.363100612 +0100
-+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java	2013-09-20 00:33:52.220645499 +0100
+--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java	2013-12-26 19:50:41.000000000 +0000
++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java	2013-12-26 22:23:06.678103309 +0000
 @@ -1315,7 +1315,7 @@
      protected void shutdownServants(boolean wait_for_completion) {
          Set<ObjectAdapterFactory> oaset;
@@ -23,8 +23,8 @@
  
          for (ObjectAdapterFactory oaf : oaset)
 diff -Nru openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java
---- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java	2012-07-09 23:52:39.000000000 +0100
-+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java	2013-09-20 00:33:52.220645499 +0100
+--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java	2013-12-26 19:50:41.000000000 +0000
++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java	2013-12-26 22:23:06.678103309 +0000
 @@ -108,7 +108,7 @@
      private ThreadGroup threadGroup;
  
@@ -44,8 +44,8 @@
  
          for (WorkerThread wt : copy) {
 diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xml/internal/serializer/Encodings.java openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/serializer/Encodings.java
---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xml/internal/serializer/Encodings.java	2013-09-20 00:32:35.455450085 +0100
-+++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/serializer/Encodings.java	2013-09-20 00:33:52.220645499 +0100
+--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xml/internal/serializer/Encodings.java	2013-12-26 22:21:55.853021204 +0000
++++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/serializer/Encodings.java	2013-12-26 22:23:06.678103309 +0000
 @@ -297,8 +297,8 @@
      //
      private final static class EncodingInfos {
@@ -67,8 +67,8 @@
                      final String javaName = (String) keys.nextElement();
                      final String[] mimes = parseMimeTypes(props.getProperty(javaName));
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/TypeResolver.java openjdk-boot/jdk/src/share/classes/com/sun/beans/TypeResolver.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/TypeResolver.java	2012-09-24 16:16:01.128926160 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/beans/TypeResolver.java	2013-09-20 00:33:52.220645499 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/TypeResolver.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/beans/TypeResolver.java	2013-12-26 22:23:06.678103309 +0000
 @@ -46,7 +46,7 @@
   */
  public final class TypeResolver {
@@ -88,8 +88,8 @@
                      CACHE.put(actual, map);
                  }
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java openjdk-boot/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java	2012-11-30 07:40:05.671148416 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java	2013-09-20 00:33:52.220645499 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java	2013-12-26 22:23:06.678103309 +0000
 @@ -62,9 +62,10 @@
   */
  public final class DocumentHandler extends DefaultHandler {
@@ -104,9 +104,57 @@
  
      private Reference<ClassLoader> loader;
      private ExceptionListener listener;
+diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/util/Cache.java openjdk-boot/jdk/src/share/classes/com/sun/beans/util/Cache.java
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/util/Cache.java	2013-12-26 22:27:51.086449155 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/beans/util/Cache.java	2013-12-26 22:32:25.923332967 +0000
+@@ -45,7 +45,7 @@
+     private final Kind keyKind; // a reference kind for the cache keys
+     private final Kind valueKind; // a reference kind for the cache values
+ 
+-    private final ReferenceQueue<Object> queue = new ReferenceQueue<>(); // queue for references to remove
++    private final ReferenceQueue<Object> queue = new ReferenceQueue<Object>(); // queue for references to remove
+ 
+     private volatile CacheEntry<K,V>[] table = newTable(1 << 3); // table's length MUST be a power of two
+     private int threshold = 6; // the next size value at which to resize
+@@ -126,7 +126,7 @@
+             }
+             V value = create(key);
+             Objects.requireNonNull(value, "value");
+-            this.table[index] = new CacheEntry<>(hash, key, value, this.table[index]);
++            this.table[index] = new CacheEntry<K,V>(hash, key, value, this.table[index]);
+             if (++this.size >= this.threshold) {
+                 if (this.table.length == MAXIMUM_CAPACITY) {
+                     this.threshold = Integer.MAX_VALUE;
+@@ -405,21 +405,21 @@
+     public static enum Kind {
+         STRONG {
+             <T> Ref<T> create(Object owner, T value, ReferenceQueue<? super T> queue) {
+-                return new Strong<>(owner, value);
++                return new Strong<T>(owner, value);
+             }
+         },
+         SOFT {
+             <T> Ref<T> create(Object owner, T referent, ReferenceQueue<? super T> queue) {
+                 return (referent == null)
+-                        ? new Strong<>(owner, referent)
+-                        : new Soft<>(owner, referent, queue);
++                        ? new Strong<T>(owner, referent)
++                        : new Soft<T>(owner, referent, queue);
+             }
+         },
+         WEAK {
+             <T> Ref<T> create(Object owner, T referent, ReferenceQueue<? super T> queue) {
+                 return (referent == null)
+-                        ? new Strong<>(owner, referent)
+-                        : new Weak<>(owner, referent, queue);
++                        ? new Strong<T>(owner, referent)
++                        : new Weak<T>(owner, referent, queue);
+             }
+         };
+ 
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java	2012-09-24 16:15:57.304854866 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java	2013-09-20 00:33:52.220645499 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java	2013-12-26 22:23:06.678103309 +0000
 @@ -104,9 +104,9 @@
          return this.def.compareTo(that.def);
      }
@@ -178,8 +226,8 @@
          for (int i = 0; i < layout.length(); i++) {
              if (layout.charAt(i++) != '[')
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java	2013-09-20 00:32:35.727454321 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java	2013-09-20 00:33:52.220645499 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java	2013-12-26 22:21:55.889021755 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java	2013-12-26 22:23:06.678103309 +0000
 @@ -257,7 +257,7 @@
          assert(basicCodings[_meta_default] == null);
          assert(basicCodings[_meta_canon_min] != null);
@@ -242,8 +290,8 @@
          return true;
      }
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java	2013-09-20 00:32:33.939426476 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java	2013-09-20 00:33:52.220645499 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java	2013-12-26 22:21:55.753019677 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java	2013-12-26 22:23:06.678103309 +0000
 @@ -466,7 +466,7 @@
  
      void readInnerClasses(Class cls) throws IOException {
@@ -254,8 +302,8 @@
              InnerClass ic =
                  new InnerClass(readClassRef(),
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java	2012-09-24 16:15:57.308854939 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java	2013-09-20 00:33:52.224645562 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java	2013-12-26 22:23:06.678103309 +0000
 @@ -402,7 +402,7 @@
      private static Map<Coding, Coding> codeMap;
  
@@ -266,8 +314,8 @@
          Coding x1 = codeMap.get(x0);
          if (x1 == null)  codeMap.put(x0, x1 = x0);
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java	2012-02-08 19:35:17.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java	2013-09-20 00:33:52.224645562 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java	2013-12-26 22:23:06.678103309 +0000
 @@ -743,9 +743,9 @@
          // Steps 1/2/3 are interdependent, and may be iterated.
          // Steps 4 and 5 may be decided independently afterward.
@@ -304,8 +352,8 @@
                  if (popset.add(values[i]))  popvals.add(values[i]);
              }
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java	2013-09-19 18:15:15.900797583 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java	2013-09-20 00:33:52.224645562 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java	2013-12-26 22:23:06.678103309 +0000
 @@ -921,7 +921,7 @@
      public static
      Index[] partition(Index ix, int[] keys) {
@@ -334,8 +382,8 @@
              Entry e = work.previous();
              work.remove();          // pop stack
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java	2013-09-20 00:32:35.739454508 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java	2013-09-20 00:33:52.224645562 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java	2013-12-26 22:21:55.889021755 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java	2013-12-26 22:23:06.678103309 +0000
 @@ -61,7 +61,7 @@
                  ResourceBundle.getBundle("com.sun.java.util.jar.pack.DriverResource");
  
@@ -373,8 +421,8 @@
          for (String optline : options.split("\n")) {
              String[] words = optline.split("\\p{Space}+");
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java	2012-02-08 19:35:17.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java	2013-09-20 00:33:52.224645562 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java	2013-12-26 22:23:06.678103309 +0000
 @@ -45,7 +45,7 @@
      private final ArrayList<E> flist;
  
@@ -385,8 +433,8 @@
          for (int i = 0 ; i < capacity ; i++) {
              flist.add(null);
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java	2013-09-20 00:32:34.019427723 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java	2013-09-20 00:33:52.224645562 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java	2013-12-26 22:21:55.753019677 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java	2013-12-26 22:23:06.682103369 +0000
 @@ -112,7 +112,7 @@
      public static final Attribute.Layout attrSourceFileSpecial;
      public static final Map<Attribute.Layout, Attribute> attrDefs;
@@ -542,8 +590,8 @@
              // Add to the end of ths list:
              if (!fileSet.contains(cls.file))
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java	2013-09-20 00:32:35.739454508 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java	2013-09-20 00:33:52.224645562 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java	2013-12-26 22:21:55.889021755 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java	2013-12-26 22:23:06.682103369 +0000
 @@ -686,7 +686,7 @@
          cp_Signature_classes.expectLength(getIntTotal(numSigClasses));
          cp_Signature_classes.readFrom(in);
@@ -657,8 +705,8 @@
              ClassEntry thisClass  = curClass.thisClass;
              ClassEntry superClass = curClass.superClass;
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java	2013-09-20 00:32:35.739454508 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java	2013-09-20 00:33:52.224645562 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java	2013-12-26 22:21:55.889021755 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java	2013-12-26 22:23:06.682103369 +0000
 @@ -116,7 +116,7 @@
      int[][]     attrCounts;       // count attr. occurences
  
@@ -714,8 +762,8 @@
          for (Class cls : pkg.classes) {
              if (!cls.hasInnerClasses())  continue;
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java	2013-04-03 01:24:47.954092395 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java	2013-09-20 00:33:52.224645562 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java	2013-12-26 22:23:06.682103369 +0000
 @@ -183,8 +183,8 @@
          final Map<Attribute.Layout, Attribute> attrDefs;
          final Map<Attribute.Layout, String> attrCommands;
@@ -746,8 +794,8 @@
                  for (JarEntry je : Collections.list(jf.entries())) {
                      InFile inFile = new InFile(jf, je);
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java	2012-02-08 19:35:18.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java	2013-09-20 00:33:52.224645562 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java	2013-12-26 22:23:06.682103369 +0000
 @@ -309,7 +309,7 @@
          // As each new value is added, we assert that the value
          // was not already in the set.
@@ -758,8 +806,8 @@
          maxForDebug += fillp;
          int min = Integer.MIN_VALUE;  // farthest from the center
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java	2013-09-20 00:32:35.739454508 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java	2013-09-20 00:33:52.224645562 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java	2013-12-26 22:21:55.889021755 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java	2013-12-26 22:23:06.682103369 +0000
 @@ -48,8 +48,8 @@
   */
  
@@ -790,8 +838,8 @@
          while (res.remove(null));
          return res;
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java	2012-09-24 16:15:57.312855013 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java	2013-09-20 00:33:52.224645562 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java	2013-12-26 22:23:06.682103369 +0000
 @@ -58,12 +58,12 @@
      private final Map<String, MemberEntry> memberEntries;
  
@@ -812,8 +860,8 @@
      }
  
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java	2013-09-20 00:32:35.739454508 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java	2013-09-20 00:33:52.224645562 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java	2013-12-26 22:21:55.889021755 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java	2013-12-26 22:23:06.682103369 +0000
 @@ -233,7 +233,7 @@
              props.setProperty(java.util.jar.Pack200.Unpacker.PROGRESS,"50");
              pkg.ensureAllClassFiles();
@@ -824,8 +872,8 @@
                  String name = file.nameString;
                  JarEntry je = new JarEntry(Utils.getJarEntryName(name));
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java	2013-09-20 00:32:35.739454508 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java	2013-09-20 00:33:52.224645562 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java	2013-12-26 22:21:55.889021755 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java	2013-12-26 22:23:06.682103369 +0000
 @@ -132,7 +132,7 @@
      // Keep a TLS point to the global data and environment.
      // This makes it simpler to supply environmental options
@@ -836,8 +884,8 @@
      // convenience methods to access the TL globals
      static TLGlobals getTLGlobals() {
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/media/sound/AbstractLine.java openjdk-boot/jdk/src/share/classes/com/sun/media/sound/AbstractLine.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/media/sound/AbstractLine.java	2013-07-08 21:17:46.503611667 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/media/sound/AbstractLine.java	2013-09-20 00:33:52.224645562 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/media/sound/AbstractLine.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/media/sound/AbstractLine.java	2013-12-26 22:23:06.682103369 +0000
 @@ -54,7 +54,7 @@
       * Contains event dispatcher per thread group.
       */
@@ -848,8 +896,8 @@
      /**
       * Constructs a new AbstractLine.
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/media/sound/RealTimeSequencer.java openjdk-boot/jdk/src/share/classes/com/sun/media/sound/RealTimeSequencer.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/media/sound/RealTimeSequencer.java	2013-07-08 21:17:46.559612557 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/media/sound/RealTimeSequencer.java	2013-09-20 00:33:52.224645562 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/media/sound/RealTimeSequencer.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/media/sound/RealTimeSequencer.java	2013-12-26 22:23:06.682103369 +0000
 @@ -59,7 +59,7 @@
       * dispatcher instance with a factory in EventDispatcher
       */
@@ -860,8 +908,8 @@
      /**
       * All RealTimeSequencers share this info object.
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/rmi/rmid/ExecOptionPermission.java openjdk-boot/jdk/src/share/classes/com/sun/rmi/rmid/ExecOptionPermission.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/rmi/rmid/ExecOptionPermission.java	2013-01-14 03:19:03.221016468 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/rmi/rmid/ExecOptionPermission.java	2013-09-20 00:33:52.224645562 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/rmi/rmid/ExecOptionPermission.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/rmi/rmid/ExecOptionPermission.java	2013-12-26 22:23:06.682103369 +0000
 @@ -231,7 +231,7 @@
           * Create an empty ExecOptionPermissionCollection.
           */
@@ -872,8 +920,8 @@
          }
  
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/rmi/rmid/ExecPermission.java openjdk-boot/jdk/src/share/classes/com/sun/rmi/rmid/ExecPermission.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/rmi/rmid/ExecPermission.java	2013-01-14 03:19:03.225016532 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/rmi/rmid/ExecPermission.java	2013-09-20 00:33:52.224645562 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/rmi/rmid/ExecPermission.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/rmi/rmid/ExecPermission.java	2013-12-26 22:23:06.682103369 +0000
 @@ -235,7 +235,7 @@
           * Create an empty ExecPermissionCollection.
           */
@@ -884,8 +932,8 @@
  
          /**
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java openjdk-boot/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java	2012-02-08 19:35:39.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java	2013-09-20 00:33:52.228645624 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java	2013-12-26 22:23:06.682103369 +0000
 @@ -1284,7 +1284,7 @@
       */
      public Collection<?> toCollection() throws SQLException {
@@ -905,8 +953,8 @@
          // create a copy
          CachedRowSetImpl crsTemp;
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/rowset/JoinRowSetImpl.java openjdk-boot/jdk/src/share/classes/com/sun/rowset/JoinRowSetImpl.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/rowset/JoinRowSetImpl.java	2012-02-08 19:35:39.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/rowset/JoinRowSetImpl.java	2013-09-20 00:33:52.228645624 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/rowset/JoinRowSetImpl.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/rowset/JoinRowSetImpl.java	2013-12-26 22:23:06.686103430 +0000
 @@ -222,7 +222,7 @@
             // either of the setter methods have been set.
             if(boolColId){
@@ -917,8 +965,8 @@
                    if( (strMatchKey = (cRowset.getMatchColumnNames())[i]) != null) {
                        iMatchKey = cRowset.findColumn(strMatchKey);
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/PolicyFile.java openjdk-boot/jdk/src/share/classes/com/sun/security/auth/PolicyFile.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/PolicyFile.java	2012-02-08 19:35:40.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/PolicyFile.java	2013-09-20 00:33:52.228645624 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/PolicyFile.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/PolicyFile.java	2013-12-26 22:23:06.686103430 +0000
 @@ -1180,7 +1180,7 @@
              // Done
              return certs;
@@ -929,8 +977,8 @@
          while (i < certs.length) {
              userCertList.add(certs[i]);
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/callback/DialogCallbackHandler.java openjdk-boot/jdk/src/share/classes/com/sun/security/auth/callback/DialogCallbackHandler.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/callback/DialogCallbackHandler.java	2012-02-08 19:35:41.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/callback/DialogCallbackHandler.java	2013-09-20 00:33:52.228645624 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/callback/DialogCallbackHandler.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/callback/DialogCallbackHandler.java	2013-12-26 22:23:06.686103430 +0000
 @@ -99,10 +99,10 @@
          throws UnsupportedCallbackException
      {
@@ -945,8 +993,8 @@
          ConfirmationInfo confirmation = new ConfirmationInfo();
  
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/login/ConfigFile.java openjdk-boot/jdk/src/share/classes/com/sun/security/auth/login/ConfigFile.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/login/ConfigFile.java	2012-02-08 19:35:41.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/login/ConfigFile.java	2013-09-20 00:33:52.228645624 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/login/ConfigFile.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/login/ConfigFile.java	2013-12-26 22:23:06.686103430 +0000
 @@ -152,7 +152,7 @@
  
          // new configuration
@@ -975,8 +1023,8 @@
              String value;
              while (peek(";") == false) {
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/JndiLoginModule.java openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/JndiLoginModule.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/JndiLoginModule.java	2012-02-08 19:35:41.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/JndiLoginModule.java	2013-09-20 00:33:52.228645624 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/JndiLoginModule.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/JndiLoginModule.java	2013-12-26 22:23:06.686103430 +0000
 @@ -184,7 +184,7 @@
      private UnixNumericUserPrincipal UIDPrincipal;
      private UnixNumericGroupPrincipal GIDPrincipal;
@@ -987,8 +1035,8 @@
      // initial state
      private Subject subject;
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java	2012-02-08 19:35:41.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java	2013-09-20 00:33:52.228645624 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java	2013-12-26 22:23:06.686103430 +0000
 @@ -658,7 +658,7 @@
                  throw new FailedLoginException(
                      "Unable to find X.509 certificate chain in keystore");
@@ -999,8 +1047,8 @@
                      certList.add(fromKeyStore[i]);
                  }
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/SolarisLoginModule.java openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/SolarisLoginModule.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/SolarisLoginModule.java	2012-02-08 19:35:41.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/SolarisLoginModule.java	2013-09-20 00:33:52.228645624 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/SolarisLoginModule.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/SolarisLoginModule.java	2013-12-26 22:23:06.686103430 +0000
 @@ -76,7 +76,7 @@
      private SolarisNumericUserPrincipal UIDPrincipal;
      private SolarisNumericGroupPrincipal GIDPrincipal;
@@ -1011,8 +1059,8 @@
      /**
       * Initialize this <code>LoginModule</code>.
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/UnixLoginModule.java openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/UnixLoginModule.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/UnixLoginModule.java	2012-02-08 19:35:41.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/UnixLoginModule.java	2013-09-20 00:33:52.228645624 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/UnixLoginModule.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/UnixLoginModule.java	2013-12-26 22:23:06.686103430 +0000
 @@ -70,7 +70,7 @@
      private UnixNumericUserPrincipal UIDPrincipal;
      private UnixNumericGroupPrincipal GIDPrincipal;
@@ -1023,8 +1071,8 @@
      /**
       * Initialize this <code>LoginModule</code>.
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/tools/example/trace/EventThread.java openjdk-boot/jdk/src/share/classes/com/sun/tools/example/trace/EventThread.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/tools/example/trace/EventThread.java	2012-09-24 16:16:01.232928097 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/tools/example/trace/EventThread.java	2013-09-20 00:33:52.228645624 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/tools/example/trace/EventThread.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/tools/example/trace/EventThread.java	2013-12-26 22:23:06.686103430 +0000
 @@ -59,7 +59,7 @@
  
      // Maps ThreadReference to ThreadTrace instances
@@ -1035,8 +1083,8 @@
      EventThread(VirtualMachine vm, String[] excludes, PrintWriter writer) {
          super("event-handler");
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/beans/Introspector.java openjdk-boot/jdk/src/share/classes/java/beans/Introspector.java
---- openjdk-boot.orig/jdk/src/share/classes/java/beans/Introspector.java	2013-01-14 03:19:03.241016793 +0000
-+++ openjdk-boot/jdk/src/share/classes/java/beans/Introspector.java	2013-09-20 00:33:52.228645624 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/beans/Introspector.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/java/beans/Introspector.java	2013-12-26 22:23:06.686103430 +0000
 @@ -97,7 +97,7 @@
      public final static int IGNORE_ALL_BEANINFO        = 3;
  
@@ -1065,18 +1113,9 @@
          }
          return targetBeanInfo;
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/beans/ThreadGroupContext.java openjdk-boot/jdk/src/share/classes/java/beans/ThreadGroupContext.java
---- openjdk-boot.orig/jdk/src/share/classes/java/beans/ThreadGroupContext.java	2013-04-23 21:48:04.116605635 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/beans/ThreadGroupContext.java	2013-09-20 00:33:52.228645624 +0100
-@@ -41,7 +41,7 @@
-  */
- final class ThreadGroupContext {
- 
--    private static final WeakIdentityMap<ThreadGroupContext> contexts = new WeakIdentityMap<>();
-+    private static final WeakIdentityMap<ThreadGroupContext> contexts = new WeakIdentityMap<ThreadGroupContext>();
- 
-     /**
-      * Returns the appropriate {@code AppContext} for the caller,
-@@ -100,7 +100,7 @@
+--- openjdk-boot.orig/jdk/src/share/classes/java/beans/ThreadGroupContext.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/java/beans/ThreadGroupContext.java	2013-12-26 22:23:06.686103430 +0000
+@@ -96,7 +96,7 @@
  
      BeanInfo putBeanInfo(Class<?> type, BeanInfo info) {
          if (this.beanInfoCache == null) {
@@ -1086,8 +1125,8 @@
          return this.beanInfoCache.put(type, info);
      }
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/io/DeleteOnExitHook.java openjdk-boot/jdk/src/share/classes/java/io/DeleteOnExitHook.java
---- openjdk-boot.orig/jdk/src/share/classes/java/io/DeleteOnExitHook.java	2012-02-08 19:36:01.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/java/io/DeleteOnExitHook.java	2013-09-20 00:33:52.228645624 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/io/DeleteOnExitHook.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/java/io/DeleteOnExitHook.java	2013-12-26 22:23:06.686103430 +0000
 @@ -34,7 +34,7 @@
   */
  
@@ -1107,8 +1146,8 @@
          // reverse the list to maintain previous jdk deletion order.
          // Last in first deleted.
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/io/File.java openjdk-boot/jdk/src/share/classes/java/io/File.java
---- openjdk-boot.orig/jdk/src/share/classes/java/io/File.java	2013-07-08 21:17:47.339624960 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/io/File.java	2013-09-20 00:33:52.232645686 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/io/File.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/java/io/File.java	2013-12-26 22:23:06.686103430 +0000
 @@ -1150,7 +1150,7 @@
          if ((names == null) || (filter == null)) {
              return names;
@@ -1137,8 +1176,8 @@
              File f = new File(s, this);
              if ((filter == null) || filter.accept(f))
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/io/FileInputStream.java openjdk-boot/jdk/src/share/classes/java/io/FileInputStream.java
---- openjdk-boot.orig/jdk/src/share/classes/java/io/FileInputStream.java	2013-07-08 21:17:47.363625342 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/io/FileInputStream.java	2013-09-20 00:33:52.228645624 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/io/FileInputStream.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/java/io/FileInputStream.java	2013-12-26 22:23:06.686103430 +0000
 @@ -61,7 +61,7 @@
      private volatile boolean closed = false;
  
@@ -1149,8 +1188,8 @@
      private static boolean isRunningFinalize() {
          Boolean val;
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/io/FileOutputStream.java openjdk-boot/jdk/src/share/classes/java/io/FileOutputStream.java
---- openjdk-boot.orig/jdk/src/share/classes/java/io/FileOutputStream.java	2013-07-08 21:17:47.387625724 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/io/FileOutputStream.java	2013-09-20 00:33:52.232645686 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/io/FileOutputStream.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/java/io/FileOutputStream.java	2013-12-26 22:23:06.686103430 +0000
 @@ -76,7 +76,7 @@
      private final Object closeLock = new Object();
      private volatile boolean closed = false;
@@ -1161,8 +1200,8 @@
      private static boolean isRunningFinalize() {
          Boolean val;
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/io/FilePermission.java openjdk-boot/jdk/src/share/classes/java/io/FilePermission.java
---- openjdk-boot.orig/jdk/src/share/classes/java/io/FilePermission.java	2012-11-30 07:40:06.187156765 +0000
-+++ openjdk-boot/jdk/src/share/classes/java/io/FilePermission.java	2013-09-20 00:33:52.232645686 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/io/FilePermission.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/java/io/FilePermission.java	2013-12-26 22:23:06.686103430 +0000
 @@ -725,7 +725,7 @@
       */
  
@@ -1191,8 +1230,8 @@
      }
  }
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/io/ObjectInputStream.java openjdk-boot/jdk/src/share/classes/java/io/ObjectInputStream.java
---- openjdk-boot.orig/jdk/src/share/classes/java/io/ObjectInputStream.java	2013-04-23 21:48:04.116605635 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/io/ObjectInputStream.java	2013-09-20 00:33:52.232645686 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/io/ObjectInputStream.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/java/io/ObjectInputStream.java	2013-12-26 22:23:06.686103430 +0000
 @@ -214,7 +214,7 @@
  
      /** table mapping primitive type names to corresponding class objects */
@@ -1217,8 +1256,8 @@
  
      /** filter stream for handling block data conversion */
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/io/ObjectOutputStream.java openjdk-boot/jdk/src/share/classes/java/io/ObjectOutputStream.java
---- openjdk-boot.orig/jdk/src/share/classes/java/io/ObjectOutputStream.java	2013-07-08 21:17:47.387625724 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/io/ObjectOutputStream.java	2013-09-20 00:33:52.232645686 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/io/ObjectOutputStream.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/java/io/ObjectOutputStream.java	2013-12-26 22:23:06.690103492 +0000
 @@ -166,11 +166,11 @@
      private static class Caches {
          /** cache of subclass security audit results */
@@ -1233,7 +1272,7 @@
      }
  
      /** filter stream for handling block data conversion */
-@@ -2426,7 +2426,7 @@
+@@ -2432,7 +2432,7 @@
          private final List<String> stack;
  
          DebugTraceInfoStack() {
@@ -1243,8 +1282,8 @@
  
          /**
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/io/ObjectStreamClass.java openjdk-boot/jdk/src/share/classes/java/io/ObjectStreamClass.java
---- openjdk-boot.orig/jdk/src/share/classes/java/io/ObjectStreamClass.java	2013-07-08 21:17:47.387625724 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/io/ObjectStreamClass.java	2013-09-20 00:33:52.232645686 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/io/ObjectStreamClass.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/java/io/ObjectStreamClass.java	2013-12-26 22:23:06.690103492 +0000
 @@ -87,18 +87,18 @@
      private static class Caches {
          /** cache mapping local classes -> descriptors */
@@ -1334,8 +1373,8 @@
                  if (ref != null) {
                      Caches.reflectors.remove(key, ref);
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/ApplicationShutdownHooks.java openjdk-boot/jdk/src/share/classes/java/lang/ApplicationShutdownHooks.java
---- openjdk-boot.orig/jdk/src/share/classes/java/lang/ApplicationShutdownHooks.java	2012-02-08 19:36:02.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/java/lang/ApplicationShutdownHooks.java	2013-09-20 00:33:52.232645686 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/lang/ApplicationShutdownHooks.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/java/lang/ApplicationShutdownHooks.java	2013-12-26 22:23:06.690103492 +0000
 @@ -47,7 +47,7 @@
                      }
                  }
@@ -1346,8 +1385,8 @@
              // application shutdown hooks cannot be added if
              // shutdown is in progress.
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/Character.java openjdk-boot/jdk/src/share/classes/java/lang/Character.java
---- openjdk-boot.orig/jdk/src/share/classes/java/lang/Character.java	2012-02-08 19:36:03.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/java/lang/Character.java	2013-09-20 00:33:52.232645686 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/lang/Character.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/java/lang/Character.java	2013-12-26 22:23:06.690103492 +0000
 @@ -646,7 +646,8 @@
       */
      public static final class UnicodeBlock extends Subset {
@@ -1368,8 +1407,8 @@
              aliases.put("ARMI", IMPERIAL_ARAMAIC);
              aliases.put("ARMN", ARMENIAN);
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/CharacterName.java openjdk-boot/jdk/src/share/classes/java/lang/CharacterName.java
---- openjdk-boot.orig/jdk/src/share/classes/java/lang/CharacterName.java	2012-02-08 19:36:03.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/java/lang/CharacterName.java	2013-09-20 00:33:52.232645686 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/lang/CharacterName.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/java/lang/CharacterName.java	2013-12-26 22:23:06.690103492 +0000
 @@ -81,7 +81,7 @@
              } while (cpOff < cpEnd);
              strPool = new byte[total - cpEnd];
@@ -1380,9 +1419,9 @@
              throw new InternalError(x.getMessage());
          } finally {
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/Class.java openjdk-boot/jdk/src/share/classes/java/lang/Class.java
---- openjdk-boot.orig/jdk/src/share/classes/java/lang/Class.java	2013-07-08 21:17:47.439626550 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/lang/Class.java	2013-09-20 00:33:52.232645686 +0100
-@@ -1336,7 +1336,7 @@
+--- openjdk-boot.orig/jdk/src/share/classes/java/lang/Class.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/java/lang/Class.java	2013-12-26 22:23:06.690103492 +0000
+@@ -1346,7 +1346,7 @@
          return java.security.AccessController.doPrivileged(
              new java.security.PrivilegedAction<Class<?>[]>() {
                  public Class[] run() {
@@ -1391,7 +1430,7 @@
                      Class<?> currentClass = Class.this;
                      while (currentClass != null) {
                          Class<?>[] members = currentClass.getDeclaredClasses();
-@@ -2387,9 +2387,9 @@
+@@ -2397,9 +2397,9 @@
          res = Reflection.filterFields(this, getDeclaredFields0(publicOnly));
          if (useCaches) {
              if (publicOnly) {
@@ -1403,7 +1442,7 @@
              }
          }
          return res;
-@@ -2411,9 +2411,9 @@
+@@ -2421,9 +2421,9 @@
  
          // No cached value available; compute value recursively.
          // Traverse in correct order for getField().
@@ -1415,7 +1454,7 @@
          }
  
          // Local fields
-@@ -2439,7 +2439,7 @@
+@@ -2449,7 +2449,7 @@
          res = new Field[fields.size()];
          fields.toArray(res);
          if (useCaches) {
@@ -1424,7 +1463,7 @@
          }
          return res;
      }
-@@ -2484,9 +2484,9 @@
+@@ -2494,9 +2494,9 @@
          }
          if (useCaches) {
              if (publicOnly) {
@@ -1436,7 +1475,7 @@
              }
          }
          return res;
-@@ -2521,9 +2521,9 @@
+@@ -2531,9 +2531,9 @@
          res = Reflection.filterMethods(this, getDeclaredMethods0(publicOnly));
          if (useCaches) {
              if (publicOnly) {
@@ -1448,7 +1487,7 @@
              }
          }
          return res;
-@@ -2679,7 +2679,7 @@
+@@ -2689,7 +2689,7 @@
          methods.compactAndTrim();
          res = methods.getArray();
          if (useCaches) {
@@ -1457,7 +1496,7 @@
          }
          return res;
      }
-@@ -3058,7 +3058,7 @@
+@@ -3068,7 +3068,7 @@
              if (universe == null)
                  throw new IllegalArgumentException(
                      getName() + " is not an enum type");
@@ -1466,7 +1505,7 @@
              for (T constant : universe)
                  m.put(((Enum<?>)constant).name(), constant);
              enumConstantDirectory = m;
-@@ -3171,7 +3171,7 @@
+@@ -3181,7 +3181,7 @@
          if (superClass == null) {
              annotations = declaredAnnotations;
          } else {
@@ -1476,9 +1515,9 @@
              for (Map.Entry<Class<? extends Annotation>, Annotation> e : superClass.annotations.entrySet()) {
                  Class<? extends Annotation> annotationClass = e.getKey();
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/ClassLoader.java openjdk-boot/jdk/src/share/classes/java/lang/ClassLoader.java
---- openjdk-boot.orig/jdk/src/share/classes/java/lang/ClassLoader.java	2013-07-08 21:17:47.451626741 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/lang/ClassLoader.java	2013-09-20 00:33:52.232645686 +0100
-@@ -247,7 +247,7 @@
+--- openjdk-boot.orig/jdk/src/share/classes/java/lang/ClassLoader.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/java/lang/ClassLoader.java	2013-12-26 22:23:06.690103492 +0000
+@@ -248,7 +248,7 @@
  
      // The classes loaded by this class loader. The only purpose of this table
      // is to keep the classes from being GC'ed until the loader is GC'ed.
@@ -1487,7 +1526,7 @@
  
      // The "default" domain. Set as the default ProtectionDomain on newly
      // created classes.
-@@ -266,7 +266,8 @@
+@@ -267,7 +267,8 @@
      // The packages defined in this class loader.  Each package name is mapped
      // to its corresponding Package object.
      // @GuardedBy("itself")
@@ -1497,7 +1536,7 @@
  
      private static Void checkCreateClassLoader() {
          SecurityManager security = System.getSecurityManager();
-@@ -279,16 +280,16 @@
+@@ -280,16 +281,16 @@
      private ClassLoader(Void unused, ClassLoader parent) {
          this.parent = parent;
          if (ParallelLoaders.isRegistered(this.getClass())) {
@@ -1518,7 +1557,7 @@
              assertionLock = this;
          }
      }
-@@ -1176,7 +1177,7 @@
+@@ -1184,7 +1185,7 @@
          }
          tmp[1] = findResources(name);
  
@@ -1527,7 +1566,7 @@
      }
  
      /**
-@@ -1675,7 +1676,7 @@
+@@ -1683,7 +1684,7 @@
      protected Package[] getPackages() {
          Map<String, Package> map;
          synchronized (packages) {
@@ -1536,7 +1575,7 @@
          }
          Package[] pkgs;
          if (parent != null) {
-@@ -1782,17 +1783,20 @@
+@@ -1790,17 +1791,20 @@
      }
  
      // All native library names we've loaded.
@@ -1561,7 +1600,7 @@
  
      // The paths searched for libraries
      private static String usr_paths[];
-@@ -2126,8 +2130,8 @@
+@@ -2134,8 +2138,8 @@
           * them to empty maps, effectively ignoring any present settings.
           */
          synchronized (assertionLock) {
@@ -1572,7 +1611,7 @@
              defaultAssertionStatus = false;
          }
      }
-@@ -2189,8 +2193,8 @@
+@@ -2197,8 +2201,8 @@
      private void initializeJavaAssertionMaps() {
          // assert Thread.holdsLock(assertionLock);
  
@@ -1584,8 +1623,8 @@
  
          for(int i = 0; i < directives.classes.length; i++)
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/ClassValue.java openjdk-boot/jdk/src/share/classes/java/lang/ClassValue.java
---- openjdk-boot.orig/jdk/src/share/classes/java/lang/ClassValue.java	2012-09-24 16:16:01.572934436 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/lang/ClassValue.java	2013-09-20 00:33:52.236645749 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/lang/ClassValue.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/java/lang/ClassValue.java	2013-12-26 22:23:06.690103492 +0000
 @@ -297,12 +297,12 @@
       * Some machines may also require a barrier instruction to execute
       * before this.version.
@@ -1627,8 +1666,8 @@
          // As soon as the Entry is put into the cache, the value will be
          // reachable via a data race (as defined by the Java Memory Model).
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/Package.java openjdk-boot/jdk/src/share/classes/java/lang/Package.java
---- openjdk-boot.orig/jdk/src/share/classes/java/lang/Package.java	2013-09-20 00:32:35.743454570 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/lang/Package.java	2013-09-20 00:33:52.236645749 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/lang/Package.java	2013-12-26 22:21:55.889021755 +0000
++++ openjdk-boot/jdk/src/share/classes/java/lang/Package.java	2013-12-26 22:23:06.690103492 +0000
 @@ -599,13 +599,16 @@
      }
  
@@ -1650,8 +1689,8 @@
      private static native String getSystemPackage0(String name);
      private static native String[] getSystemPackages0();
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/ProcessBuilder.java openjdk-boot/jdk/src/share/classes/java/lang/ProcessBuilder.java
---- openjdk-boot.orig/jdk/src/share/classes/java/lang/ProcessBuilder.java	2013-09-20 00:32:35.455450085 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/lang/ProcessBuilder.java	2013-09-20 00:33:52.236645749 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/lang/ProcessBuilder.java	2013-12-26 22:21:55.853021204 +0000
++++ openjdk-boot/jdk/src/share/classes/java/lang/ProcessBuilder.java	2013-12-26 22:23:06.690103492 +0000
 @@ -214,7 +214,7 @@
       * @param command a string array containing the program and its arguments
       */
@@ -1671,8 +1710,8 @@
              this.command.add(arg);
          return this;
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/String.java openjdk-boot/jdk/src/share/classes/java/lang/String.java
---- openjdk-boot.orig/jdk/src/share/classes/java/lang/String.java	2012-09-24 16:16:01.572934436 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/lang/String.java	2013-09-20 00:33:52.240645811 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/lang/String.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/java/lang/String.java	2013-12-26 22:23:06.694103552 +0000
 @@ -2282,7 +2282,7 @@
              int off = 0;
              int next = 0;
@@ -1683,8 +1722,8 @@
                  if (!limited || list.size() < limit - 1) {
                      list.add(substring(off, next));
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/StringCoding.java openjdk-boot/jdk/src/share/classes/java/lang/StringCoding.java
---- openjdk-boot.orig/jdk/src/share/classes/java/lang/StringCoding.java	2012-09-24 16:16:01.576934510 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/lang/StringCoding.java	2013-09-20 00:33:52.236645749 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/lang/StringCoding.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/java/lang/StringCoding.java	2013-12-26 22:23:06.694103552 +0000
 @@ -53,9 +53,9 @@
  
      /** The cached coders for each thread */
@@ -1698,9 +1737,9 @@
      private static boolean warnUnsupportedCharset = true;
  
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/Thread.java openjdk-boot/jdk/src/share/classes/java/lang/Thread.java
---- openjdk-boot.orig/jdk/src/share/classes/java/lang/Thread.java	2013-07-08 21:17:47.495627441 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/lang/Thread.java	2013-09-20 00:33:52.240645811 +0100
-@@ -1617,7 +1617,8 @@
+--- openjdk-boot.orig/jdk/src/share/classes/java/lang/Thread.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/java/lang/Thread.java	2013-12-26 22:23:06.694103552 +0000
+@@ -1637,7 +1637,8 @@
          // Get a snapshot of the list of all threads
          Thread[] threads = getThreads();
          StackTraceElement[][] traces = dumpThreads(threads);
@@ -1710,7 +1749,7 @@
          for (int i = 0; i < threads.length; i++) {
              StackTraceElement[] stackTrace = traces[i];
              if (stackTrace != null) {
-@@ -1638,11 +1639,11 @@
+@@ -1658,11 +1659,11 @@
      private static class Caches {
          /** cache of subclass security audit results */
          static final ConcurrentMap<WeakClassKey,Boolean> subclassAudits =
@@ -1725,8 +1764,8 @@
  
      /**
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/Throwable.java openjdk-boot/jdk/src/share/classes/java/lang/Throwable.java
---- openjdk-boot.orig/jdk/src/share/classes/java/lang/Throwable.java	2013-07-08 21:17:47.495627441 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/lang/Throwable.java	2013-09-20 00:33:52.240645811 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/lang/Throwable.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/java/lang/Throwable.java	2013-12-26 22:23:06.694103552 +0000
 @@ -918,7 +918,7 @@
                  // Use the sentinel for a zero-length list
                  suppressed = SUPPRESSED_SENTINEL;
@@ -1746,8 +1785,8 @@
          suppressedExceptions.add(exception);
      }
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/BoundMethodHandle.java openjdk-boot/jdk/src/share/classes/java/lang/invoke/BoundMethodHandle.java
---- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/BoundMethodHandle.java	2013-09-20 00:32:37.195477183 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/BoundMethodHandle.java	2013-09-20 00:33:52.236645749 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/BoundMethodHandle.java	2013-12-26 22:21:55.929022366 +0000
++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/BoundMethodHandle.java	2013-12-26 22:23:06.694103552 +0000
 @@ -393,7 +393,7 @@
          }
          private boolean isPlaceholder() { return clazz == null; }
@@ -1758,8 +1797,8 @@
  
          SpeciesData extendWithType(char type) {
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/DirectMethodHandle.java openjdk-boot/jdk/src/share/classes/java/lang/invoke/DirectMethodHandle.java
---- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/DirectMethodHandle.java	2013-04-03 01:24:48.114094904 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/DirectMethodHandle.java	2013-09-20 00:33:52.236645749 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/DirectMethodHandle.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/DirectMethodHandle.java	2013-12-26 22:23:06.694103552 +0000
 @@ -326,7 +326,7 @@
              if (UNSAFE.shouldBeInitialized(type))
                  // If the previous call didn't block, this can happen.
@@ -1770,8 +1809,8 @@
          }
          static final EnsureInitialized INSTANCE = new EnsureInitialized();
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java openjdk-boot/jdk/src/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java
---- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java	2013-09-20 00:32:37.195477183 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java	2013-09-20 00:33:52.236645749 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java	2013-12-26 22:21:55.929022366 +0000
++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java	2013-12-26 22:23:06.694103552 +0000
 @@ -129,7 +129,7 @@
  
      static {
@@ -1791,8 +1830,8 @@
      int cph = 0;  // for counting constant placeholders
  
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/LambdaForm.java openjdk-boot/jdk/src/share/classes/java/lang/invoke/LambdaForm.java
---- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/LambdaForm.java	2013-09-20 00:32:37.195477183 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/LambdaForm.java	2013-09-20 00:33:52.236645749 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/LambdaForm.java	2013-12-26 22:21:55.929022366 +0000
++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/LambdaForm.java	2013-12-26 22:23:06.694103552 +0000
 @@ -468,12 +468,12 @@
          int   capacity   = 512;    // expect many distinct signatures over time
          float loadFactor = 0.75f;  // normal default
@@ -1809,8 +1848,8 @@
              if (!m.isStatic() || !m.isPackage())  continue;
              MethodType mt = m.getMethodType();
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MemberName.java openjdk-boot/jdk/src/share/classes/java/lang/invoke/MemberName.java
---- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MemberName.java	2013-07-08 21:17:47.495627441 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MemberName.java	2013-09-20 00:33:52.236645749 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MemberName.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MemberName.java	2013-12-26 22:23:06.694103552 +0000
 @@ -808,14 +808,14 @@
                  // JVM returned to us with an intentional overflow!
                  totalCount += buf.length;
@@ -1829,8 +1868,8 @@
                  for (MemberName[] buf0 : bufs) {
                      Collections.addAll(result, buf0);
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandle.java openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandle.java
---- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandle.java	2012-11-30 07:40:06.259157930 +0000
-+++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandle.java	2013-09-20 00:33:52.236645749 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandle.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandle.java	2013-12-26 22:23:06.694103552 +0000
 @@ -824,7 +824,7 @@
                  }
              }
@@ -1841,8 +1880,8 @@
                      ptypes.set(i, arrayElement);
                  }
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java
---- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java	2013-09-20 00:32:37.199477245 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java	2013-09-20 00:33:52.236645749 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java	2013-12-26 22:21:55.929022366 +0000
++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java	2013-12-26 22:23:06.694103552 +0000
 @@ -73,8 +73,8 @@
  
      static final class ArrayAccessor {
@@ -1864,9 +1903,9 @@
              for (;;) {
                  int nargs = invokes.size();
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandles.java openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandles.java
---- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandles.java	2013-07-08 21:17:47.539628140 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandles.java	2013-09-20 00:33:52.236645749 +0100
-@@ -1795,7 +1795,7 @@
+--- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandles.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandles.java	2013-12-26 22:23:06.694103552 +0000
+@@ -1808,7 +1808,7 @@
          int inargs  = outargs + dropped;
          if (pos < 0 || pos >= inargs)
              throw newIllegalArgumentException("no argument type to remove");
@@ -1876,8 +1915,8 @@
          MethodType newType = MethodType.methodType(oldType.returnType(), ptypes);
          return target.dropArguments(newType, pos, dropped);
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodType.java openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodType.java
---- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodType.java	2012-11-30 07:40:06.323158964 +0000
-+++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodType.java	2013-09-20 00:33:52.236645749 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodType.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodType.java	2013-12-26 22:23:06.694103552 +0000
 @@ -1048,7 +1048,7 @@
          private final float loadFactor;
  
@@ -1888,8 +1927,8 @@
          private Entry[] newTable(int n) {
              return new Entry[n];
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/management/ManagementFactory.java openjdk-boot/jdk/src/share/classes/java/lang/management/ManagementFactory.java
---- openjdk-boot.orig/jdk/src/share/classes/java/lang/management/ManagementFactory.java	2013-09-20 00:32:35.447449961 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/lang/management/ManagementFactory.java	2013-09-20 00:33:52.236645749 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/lang/management/ManagementFactory.java	2013-12-26 22:21:55.845021083 +0000
++++ openjdk-boot/jdk/src/share/classes/java/lang/management/ManagementFactory.java	2013-12-26 22:23:06.694103552 +0000
 @@ -789,7 +789,7 @@
             getPlatformManagementInterfaces()
      {
@@ -1900,8 +1939,8 @@
              result.add(component.getMXBeanInterface());
          }
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/management/PlatformComponent.java openjdk-boot/jdk/src/share/classes/java/lang/management/PlatformComponent.java
---- openjdk-boot.orig/jdk/src/share/classes/java/lang/management/PlatformComponent.java	2012-02-08 19:36:07.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/java/lang/management/PlatformComponent.java	2013-09-20 00:33:52.236645749 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/lang/management/PlatformComponent.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/java/lang/management/PlatformComponent.java	2013-12-26 22:23:06.694103552 +0000
 @@ -287,7 +287,7 @@
              List<T> getGcMXBeanList(Class<T> gcMXBeanIntf) {
          List<GarbageCollectorMXBean> list =
@@ -1939,8 +1978,8 @@
                  // Use String as the key rather than Class<?> to avoid
                  // causing unnecessary class loading of management interface
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/reflect/Constructor.java openjdk-boot/jdk/src/share/classes/java/lang/reflect/Constructor.java
---- openjdk-boot.orig/jdk/src/share/classes/java/lang/reflect/Constructor.java	2013-07-08 21:17:47.547628267 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/lang/reflect/Constructor.java	2013-09-20 00:33:52.236645749 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/lang/reflect/Constructor.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/java/lang/reflect/Constructor.java	2013-12-26 22:23:06.694103552 +0000
 @@ -137,7 +137,7 @@
          // which implicitly requires that new java.lang.reflect
          // objects be fabricated for each reflective call on Class
@@ -1951,38 +1990,29 @@
                                                  exceptionTypes, modifiers, slot,
                                                  signature,
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/reflect/Proxy.java openjdk-boot/jdk/src/share/classes/java/lang/reflect/Proxy.java
---- openjdk-boot.orig/jdk/src/share/classes/java/lang/reflect/Proxy.java	2013-09-20 00:32:35.455450085 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/lang/reflect/Proxy.java	2013-09-20 00:33:52.236645749 +0100
-@@ -239,7 +239,7 @@
- 
-     /** maps a class loader to the proxy class cache for that loader */
-     private static Map<ClassLoader, Map<List<String>, Object>> loaderToCache
--        = new WeakHashMap<>();
-+        = new WeakHashMap<ClassLoader, Map<List<String>, Object>>();
- 
-     /** marks that a particular proxy class is currently being generated */
-     private static Object pendingGenerationMarker = new Object();
-@@ -470,7 +470,7 @@
-         String[] interfaceNames = new String[interfaces.length];
- 
-         // for detecting duplicates
--        Set<Class<?>> interfaceSet = new HashSet<>();
-+        Set<Class<?>> interfaceSet = new HashSet<Class<?>>();
- 
-         for (int i = 0; i < interfaces.length; i++) {
-             /*
-@@ -527,7 +527,7 @@
-         synchronized (loaderToCache) {
-             cache = loaderToCache.get(loader);
-             if (cache == null) {
--                cache = new HashMap<>();
-+                cache = new HashMap<List<String>, Object>();
-                 loaderToCache.put(loader, cache);
-             }
-             /*
+--- openjdk-boot.orig/jdk/src/share/classes/java/lang/reflect/Proxy.java	2013-12-26 22:21:55.853021204 +0000
++++ openjdk-boot/jdk/src/share/classes/java/lang/reflect/Proxy.java	2013-12-26 22:24:22.243257895 +0000
+@@ -234,7 +234,7 @@
+      * a cache of proxy classes
+      */
+     private static final WeakCache<ClassLoader, Class<?>[], Class<?>>
+-        proxyClassCache = new WeakCache<>(new KeyFactory(), new ProxyClassFactory());
++        proxyClassCache = new WeakCache<ClassLoader, Class<?>[], Class<?>>(new KeyFactory(), new ProxyClassFactory());
+ 
+     /**
+      * the invocation handler for this proxy instance.
+@@ -600,7 +600,7 @@
+         @Override
+         public Class<?> apply(ClassLoader loader, Class<?>[] interfaces) {
+ 
+-            Map<Class<?>, Boolean> interfaceSet = new IdentityHashMap<>(interfaces.length);
++	  Map<Class<?>, Boolean> interfaceSet = new IdentityHashMap<Class<?>, Boolean>(interfaces.length);
+             for (Class<?> intf : interfaces) {
+                 /*
+                  * Verify that the class loader resolves the name of this
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/reflect/ReflectAccess.java openjdk-boot/jdk/src/share/classes/java/lang/reflect/ReflectAccess.java
---- openjdk-boot.orig/jdk/src/share/classes/java/lang/reflect/ReflectAccess.java	2012-02-08 19:36:07.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/java/lang/reflect/ReflectAccess.java	2013-09-20 00:33:52.236645749 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/lang/reflect/ReflectAccess.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/java/lang/reflect/ReflectAccess.java	2013-12-26 22:23:06.698103613 +0000
 @@ -84,7 +84,7 @@
                                               byte[] annotations,
                                               byte[] parameterAnnotations)
@@ -1992,10 +2022,65 @@
                                    parameterTypes,
                                    checkedExceptions,
                                    modifiers,
+diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/reflect/WeakCache.java openjdk-boot/jdk/src/share/classes/java/lang/reflect/WeakCache.java
+--- openjdk-boot.orig/jdk/src/share/classes/java/lang/reflect/WeakCache.java	2013-12-26 22:28:41.175347499 +0000
++++ openjdk-boot/jdk/src/share/classes/java/lang/reflect/WeakCache.java	2013-12-26 22:31:28.022323347 +0000
+@@ -71,12 +71,12 @@
+     }
+ 
+     private final ReferenceQueue<K> refQueue
+-        = new ReferenceQueue<>();
++        = new ReferenceQueue<K>();
+     // the key type is Object for supporting null key
+     private final ConcurrentMap<Object, ConcurrentMap<Object, Supplier<V>>> map
+-        = new ConcurrentHashMap<>();
++        = new ConcurrentHashMap<Object, ConcurrentMap<Object, Supplier<V>>>();
+     private final ConcurrentMap<Supplier<V>, Boolean> reverseMap
+-        = new ConcurrentHashMap<>();
++        = new ConcurrentHashMap<Supplier<V>, Boolean>();
+     private final BiFunction<K, P, ?> subKeyFactory;
+     private final BiFunction<K, P, V> valueFactory;
+ 
+@@ -123,7 +123,7 @@
+         if (valuesMap == null) {
+             ConcurrentMap<Object, Supplier<V>> oldValuesMap
+                 = map.putIfAbsent(cacheKey,
+-                                  valuesMap = new ConcurrentHashMap<>());
++                                  valuesMap = new ConcurrentHashMap<Object, Supplier<V>>());
+             if (oldValuesMap != null) {
+                 valuesMap = oldValuesMap;
+             }
+@@ -186,7 +186,7 @@
+         Objects.requireNonNull(value);
+ 
+         expungeStaleEntries();
+-        return reverseMap.containsKey(new LookupValue<>(value));
++        return reverseMap.containsKey(new LookupValue<V>(value));
+     }
+ 
+     /**
+@@ -251,7 +251,7 @@
+             assert value != null;
+ 
+             // wrap value with CacheValue (WeakReference)
+-            CacheValue<V> cacheValue = new CacheValue<>(value);
++            CacheValue<V> cacheValue = new CacheValue<V>(value);
+ 
+             // try replacing us with CacheValue (this should always succeed)
+             if (valuesMap.replace(subKey, this, cacheValue)) {
+@@ -349,7 +349,7 @@
+                    // so we use a NULL_KEY singleton as cache key
+                    ? NULL_KEY
+                    // non-null key requires wrapping with a WeakReference
+-                   : new CacheKey<>(key, refQueue);
++                   : new CacheKey<K>(key, refQueue);
+         }
+ 
+         private final int hash;
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/net/InetAddress.java openjdk-boot/jdk/src/share/classes/java/net/InetAddress.java
---- openjdk-boot.orig/jdk/src/share/classes/java/net/InetAddress.java	2013-04-23 21:48:04.140606018 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/net/InetAddress.java	2013-09-20 00:33:52.240645811 +0100
-@@ -705,7 +705,7 @@
+--- openjdk-boot.orig/jdk/src/share/classes/java/net/InetAddress.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/java/net/InetAddress.java	2013-12-26 22:23:06.698103613 +0000
+@@ -712,7 +712,7 @@
  
      static InetAddressImpl  impl;
  
@@ -2004,7 +2089,7 @@
  
      /**
       * Represents a cache entry
-@@ -764,7 +764,7 @@
+@@ -771,7 +771,7 @@
  
                  // As we iterate in insertion order we can
                  // terminate when a non-expired entry is found.
@@ -2014,8 +2099,8 @@
                  for (String key : cache.keySet()) {
                      CacheEntry entry = cache.get(key);
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/net/URLClassLoader.java openjdk-boot/jdk/src/share/classes/java/net/URLClassLoader.java
---- openjdk-boot.orig/jdk/src/share/classes/java/net/URLClassLoader.java	2012-02-08 19:36:09.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/java/net/URLClassLoader.java	2013-09-20 00:33:52.240645811 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/net/URLClassLoader.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/java/net/URLClassLoader.java	2013-12-26 22:23:06.698103613 +0000
 @@ -205,7 +205,7 @@
       */
  
@@ -2026,8 +2111,8 @@
      /**
       * Returns an input stream for reading the specified resource.
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/nio/file/Files.java openjdk-boot/jdk/src/share/classes/java/nio/file/Files.java
---- openjdk-boot.orig/jdk/src/share/classes/java/nio/file/Files.java	2013-09-20 00:32:35.743454570 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/nio/file/Files.java	2013-09-20 00:33:52.240645811 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/nio/file/Files.java	2013-12-26 22:21:55.893021816 +0000
++++ openjdk-boot/jdk/src/share/classes/java/nio/file/Files.java	2013-12-26 22:23:06.698103613 +0000
 @@ -1504,7 +1504,7 @@
              return AccessController
                  .doPrivileged(new PrivilegedAction<List<FileTypeDetector>>() {
@@ -2037,7 +2122,7 @@
                          ServiceLoader<FileTypeDetector> loader = ServiceLoader
                              .load(FileTypeDetector.class, ClassLoader.getSystemClassLoader());
                          for (FileTypeDetector detector: loader) {
-@@ -3052,7 +3052,7 @@
+@@ -3055,7 +3055,7 @@
          BufferedReader reader = null;
          try {
              reader = newBufferedReader(path, cs);
@@ -2047,8 +2132,8 @@
                  String line = reader.readLine();
                  if (line == null)
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/security/AccessControlContext.java openjdk-boot/jdk/src/share/classes/java/security/AccessControlContext.java
---- openjdk-boot.orig/jdk/src/share/classes/java/security/AccessControlContext.java	2013-07-08 21:17:47.611629286 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/security/AccessControlContext.java	2013-09-20 00:33:52.240645811 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/security/AccessControlContext.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/java/security/AccessControlContext.java	2013-12-26 22:23:06.698103613 +0000
 @@ -127,7 +127,7 @@
                  this.context = null;
              }
@@ -2059,8 +2144,8 @@
                  if ((context[i] != null) &&  (!v.contains(context[i])))
                      v.add(context[i]);
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/security/BasicPermission.java openjdk-boot/jdk/src/share/classes/java/security/BasicPermission.java
---- openjdk-boot.orig/jdk/src/share/classes/java/security/BasicPermission.java	2012-02-08 19:36:14.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/java/security/BasicPermission.java	2013-09-20 00:33:52.240645811 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/security/BasicPermission.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/java/security/BasicPermission.java	2013-12-26 22:23:06.698103613 +0000
 @@ -515,7 +515,7 @@
  
          // Copy perms into a Hashtable
@@ -2071,8 +2156,8 @@
          synchronized (this) {
              permissions.putAll(perms);
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/security/CodeSource.java openjdk-boot/jdk/src/share/classes/java/security/CodeSource.java
---- openjdk-boot.orig/jdk/src/share/classes/java/security/CodeSource.java	2012-09-24 16:16:01.592934810 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/security/CodeSource.java	2013-09-20 00:33:52.240645811 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/security/CodeSource.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/java/security/CodeSource.java	2013-12-26 22:23:06.698103613 +0000
 @@ -188,7 +188,7 @@
          } else if (signers != null) {
              // Convert the code signers to certs
@@ -2096,8 +2181,8 @@
                  int j = i;
  
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/security/Permissions.java openjdk-boot/jdk/src/share/classes/java/security/Permissions.java
---- openjdk-boot.orig/jdk/src/share/classes/java/security/Permissions.java	2012-02-08 19:36:15.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/java/security/Permissions.java	2013-09-20 00:33:52.240645811 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/security/Permissions.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/java/security/Permissions.java	2013-12-26 22:23:06.698103613 +0000
 @@ -362,7 +362,7 @@
  
          // Copy perms into a Hashtable
@@ -2117,8 +2202,8 @@
              perms.putAll(permsMap);
          }
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/security/Policy.java openjdk-boot/jdk/src/share/classes/java/security/Policy.java
---- openjdk-boot.orig/jdk/src/share/classes/java/security/Policy.java	2012-09-24 16:16:01.592934810 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/security/Policy.java	2013-09-20 00:33:52.240645811 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/security/Policy.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/java/security/Policy.java	2013-12-26 22:23:06.698103613 +0000
 @@ -118,7 +118,7 @@
  
      // PolicyInfo is stored in an AtomicReference
@@ -2138,8 +2223,8 @@
          }
  
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/security/ProtectionDomain.java openjdk-boot/jdk/src/share/classes/java/security/ProtectionDomain.java
---- openjdk-boot.orig/jdk/src/share/classes/java/security/ProtectionDomain.java	2013-07-08 21:17:47.615629349 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/security/ProtectionDomain.java	2013-09-20 00:33:52.240645811 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/security/ProtectionDomain.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/java/security/ProtectionDomain.java	2013-12-26 22:23:06.698103613 +0000
 @@ -373,8 +373,8 @@
          int swag = 32;
          int vcap = 8;
@@ -2152,8 +2237,8 @@
          //
          // Build a vector of domain permissions for subsequent merge
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/security/Provider.java openjdk-boot/jdk/src/share/classes/java/security/Provider.java
---- openjdk-boot.orig/jdk/src/share/classes/java/security/Provider.java	2012-02-08 19:36:15.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/java/security/Provider.java	2013-09-20 00:33:52.240645811 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/security/Provider.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/java/security/Provider.java	2013-12-26 22:23:06.698103613 +0000
 @@ -437,7 +437,7 @@
  
      private void readObject(ObjectInputStream in)
@@ -2182,8 +2267,8 @@
                              Class clazz = getKeyClass(className);
                              if (clazz != null) {
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/security/SecureClassLoader.java openjdk-boot/jdk/src/share/classes/java/security/SecureClassLoader.java
---- openjdk-boot.orig/jdk/src/share/classes/java/security/SecureClassLoader.java	2012-02-08 19:36:15.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/java/security/SecureClassLoader.java	2013-09-20 00:33:52.240645811 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/security/SecureClassLoader.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/java/security/SecureClassLoader.java	2013-12-26 22:23:06.698103613 +0000
 @@ -50,7 +50,7 @@
      // HashMap that maps CodeSource to ProtectionDomain
      // @GuardedBy("pdcache")
@@ -2194,8 +2279,8 @@
      private static final Debug debug = Debug.getInstance("scl");
  
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/security/Security.java openjdk-boot/jdk/src/share/classes/java/security/Security.java
---- openjdk-boot.orig/jdk/src/share/classes/java/security/Security.java	2012-02-08 19:36:15.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/java/security/Security.java	2013-09-20 00:33:52.244645873 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/security/Security.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/java/security/Security.java	2013-12-26 22:23:06.698103613 +0000
 @@ -546,7 +546,7 @@
              value = filter.substring(index + 1);
          }
@@ -2242,8 +2327,8 @@
  
          for (int i = 0; i < providers.length; i++) {
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/security/UnresolvedPermission.java openjdk-boot/jdk/src/share/classes/java/security/UnresolvedPermission.java
---- openjdk-boot.orig/jdk/src/share/classes/java/security/UnresolvedPermission.java	2012-02-08 19:36:15.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/java/security/UnresolvedPermission.java	2013-09-20 00:33:52.244645873 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/security/UnresolvedPermission.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/java/security/UnresolvedPermission.java	2013-12-26 22:23:06.698103613 +0000
 @@ -198,7 +198,7 @@
                  if (this.certs == null) {
                      // extract the signer certs
@@ -2254,8 +2339,8 @@
                      while (i < certs.length) {
                          signerCerts.add(certs[i]);
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/security/UnresolvedPermissionCollection.java openjdk-boot/jdk/src/share/classes/java/security/UnresolvedPermissionCollection.java
---- openjdk-boot.orig/jdk/src/share/classes/java/security/UnresolvedPermissionCollection.java	2012-02-08 19:36:15.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/java/security/UnresolvedPermissionCollection.java	2013-09-20 00:33:52.244645873 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/security/UnresolvedPermissionCollection.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/java/security/UnresolvedPermissionCollection.java	2013-12-26 22:23:06.698103613 +0000
 @@ -119,7 +119,7 @@
  
      public Enumeration<Permission> elements() {
@@ -2293,8 +2378,8 @@
  
              // Add to Hashtable being serialized
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/AbstractList.java openjdk-boot/jdk/src/share/classes/java/util/AbstractList.java
---- openjdk-boot.orig/jdk/src/share/classes/java/util/AbstractList.java	2012-02-08 19:36:19.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/java/util/AbstractList.java	2013-09-20 00:33:52.244645873 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/util/AbstractList.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/java/util/AbstractList.java	2013-12-26 22:23:06.698103613 +0000
 @@ -482,8 +482,8 @@
       */
      public List<E> subList(int fromIndex, int toIndex) {
@@ -2324,8 +2409,8 @@
      }
  }
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/Arrays.java openjdk-boot/jdk/src/share/classes/java/util/Arrays.java
---- openjdk-boot.orig/jdk/src/share/classes/java/util/Arrays.java	2012-02-08 19:36:20.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/java/util/Arrays.java	2013-09-20 00:33:52.244645873 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/util/Arrays.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/java/util/Arrays.java	2013-12-26 22:23:06.702103675 +0000
 @@ -2825,7 +2825,7 @@
       */
      @SafeVarargs
@@ -2336,8 +2421,8 @@
  
      /**
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/Collections.java openjdk-boot/jdk/src/share/classes/java/util/Collections.java
---- openjdk-boot.orig/jdk/src/share/classes/java/util/Collections.java	2012-09-24 16:16:01.596934883 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/util/Collections.java	2013-09-20 00:33:52.244645873 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/util/Collections.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/java/util/Collections.java	2013-12-26 22:23:06.702103675 +0000
 @@ -1035,7 +1035,7 @@
       * @return an unmodifiable view of the specified collection.
       */
@@ -2963,8 +3048,8 @@
  
      /**
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/EnumMap.java openjdk-boot/jdk/src/share/classes/java/util/EnumMap.java
---- openjdk-boot.orig/jdk/src/share/classes/java/util/EnumMap.java	2013-07-08 21:17:47.619629412 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/util/EnumMap.java	2013-09-20 00:33:52.244645873 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/util/EnumMap.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/java/util/EnumMap.java	2013-12-26 22:23:06.702103675 +0000
 @@ -508,7 +508,7 @@
              int j = 0;
              for (int i = 0; i < vals.length; i++)
@@ -2975,8 +3060,8 @@
              return a;
          }
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/EnumSet.java openjdk-boot/jdk/src/share/classes/java/util/EnumSet.java
---- openjdk-boot.orig/jdk/src/share/classes/java/util/EnumSet.java	2012-02-08 19:36:20.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/java/util/EnumSet.java	2013-09-20 00:33:52.244645873 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/util/EnumSet.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/java/util/EnumSet.java	2013-12-26 22:23:06.702103675 +0000
 @@ -110,9 +110,9 @@
              throw new ClassCastException(elementType + " not an enum");
  
@@ -2999,8 +3084,8 @@
  
      // readObject method for the serialization proxy pattern
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/Formatter.java openjdk-boot/jdk/src/share/classes/java/util/Formatter.java
---- openjdk-boot.orig/jdk/src/share/classes/java/util/Formatter.java	2013-09-20 00:32:35.447449961 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/util/Formatter.java	2013-09-20 00:33:52.244645873 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/util/Formatter.java	2013-12-26 22:21:55.849021144 +0000
++++ openjdk-boot/jdk/src/share/classes/java/util/Formatter.java	2013-12-26 22:23:06.702103675 +0000
 @@ -2514,7 +2514,7 @@
       * Finds format specifiers in the format string.
       */
@@ -3011,8 +3096,8 @@
          for (int i = 0, len = s.length(); i < len; ) {
              if (m.find(i)) {
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/HashMap.java openjdk-boot/jdk/src/share/classes/java/util/HashMap.java
---- openjdk-boot.orig/jdk/src/share/classes/java/util/HashMap.java	2013-09-19 18:15:14.492775932 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/util/HashMap.java	2013-09-20 00:33:52.244645873 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/util/HashMap.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/java/util/HashMap.java	2013-12-26 22:23:06.702103675 +0000
 @@ -894,7 +894,7 @@
       */
      void createEntry(int hash, K key, V value, int bucketIndex) {
@@ -3023,8 +3108,8 @@
      }
  
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/HashSet.java openjdk-boot/jdk/src/share/classes/java/util/HashSet.java
---- openjdk-boot.orig/jdk/src/share/classes/java/util/HashSet.java	2012-02-08 19:36:20.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/java/util/HashSet.java	2013-09-20 00:33:52.244645873 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/util/HashSet.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/java/util/HashSet.java	2013-12-26 22:23:06.702103675 +0000
 @@ -100,7 +100,7 @@
       * default initial capacity (16) and load factor (0.75).
       */
@@ -3071,8 +3156,8 @@
  
      /**
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/Hashtable.java openjdk-boot/jdk/src/share/classes/java/util/Hashtable.java
---- openjdk-boot.orig/jdk/src/share/classes/java/util/Hashtable.java	2013-04-03 01:24:48.334098354 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/util/Hashtable.java	2013-09-20 00:33:52.248645936 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/util/Hashtable.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/java/util/Hashtable.java	2013-12-26 22:23:06.702103675 +0000
 @@ -538,7 +538,7 @@
  
          // Creates the new entry.
@@ -3128,8 +3213,8 @@
          }
  
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/IdentityHashMap.java openjdk-boot/jdk/src/share/classes/java/util/IdentityHashMap.java
---- openjdk-boot.orig/jdk/src/share/classes/java/util/IdentityHashMap.java	2012-02-08 19:36:20.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/java/util/IdentityHashMap.java	2013-09-20 00:33:52.248645936 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/util/IdentityHashMap.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/java/util/IdentityHashMap.java	2013-12-26 22:23:06.702103675 +0000
 @@ -1145,7 +1145,7 @@
              Object[] result = new Object[size];
              Iterator<Map.Entry<K,V>> it = iterator();
@@ -3149,8 +3234,8 @@
                  a[size] = null;
              return a;
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/JumboEnumSet.java openjdk-boot/jdk/src/share/classes/java/util/JumboEnumSet.java
---- openjdk-boot.orig/jdk/src/share/classes/java/util/JumboEnumSet.java	2012-02-08 19:36:21.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/java/util/JumboEnumSet.java	2013-09-20 00:33:52.248645936 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/util/JumboEnumSet.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/java/util/JumboEnumSet.java	2013-12-26 22:23:06.702103675 +0000
 @@ -91,7 +91,7 @@
       * @return an iterator over the elements contained in this set
       */
@@ -3161,8 +3246,8 @@
  
      private class EnumSetIterator<E extends Enum<E>> implements Iterator<E> {
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/LinkedHashMap.java openjdk-boot/jdk/src/share/classes/java/util/LinkedHashMap.java
---- openjdk-boot.orig/jdk/src/share/classes/java/util/LinkedHashMap.java	2012-09-24 16:16:01.600934957 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/util/LinkedHashMap.java	2013-09-20 00:33:52.248645936 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/util/LinkedHashMap.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/java/util/LinkedHashMap.java	2013-12-26 22:23:06.702103675 +0000
 @@ -238,7 +238,7 @@
       */
      @Override
@@ -3182,8 +3267,8 @@
          e.addBefore(header);
          size++;
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/LinkedList.java openjdk-boot/jdk/src/share/classes/java/util/LinkedList.java
---- openjdk-boot.orig/jdk/src/share/classes/java/util/LinkedList.java	2012-02-08 19:36:21.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/java/util/LinkedList.java	2013-09-20 00:33:52.248645936 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/util/LinkedList.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/java/util/LinkedList.java	2013-12-26 22:23:06.702103675 +0000
 @@ -122,7 +122,7 @@
       */
      private void linkFirst(E e) {
@@ -3221,8 +3306,8 @@
                  first = newNode;
              else
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/ListResourceBundle.java openjdk-boot/jdk/src/share/classes/java/util/ListResourceBundle.java
---- openjdk-boot.orig/jdk/src/share/classes/java/util/ListResourceBundle.java	2012-02-08 19:36:21.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/java/util/ListResourceBundle.java	2013-09-20 00:33:52.248645936 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/util/ListResourceBundle.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/java/util/ListResourceBundle.java	2013-12-26 22:23:06.702103675 +0000
 @@ -187,7 +187,7 @@
              return;
  
@@ -3233,8 +3318,8 @@
              // key must be non-null String, value must be non-null
              String key = (String) contents[i][0];
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/Locale.java openjdk-boot/jdk/src/share/classes/java/util/Locale.java
---- openjdk-boot.orig/jdk/src/share/classes/java/util/Locale.java	2012-02-08 19:36:21.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/java/util/Locale.java	2013-09-20 00:33:52.248645936 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/util/Locale.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/java/util/Locale.java	2013-12-26 22:23:06.706103735 +0000
 @@ -1793,7 +1793,7 @@
                  return formatList(variantNames, listPattern, listCompositionPattern);
              }
@@ -3245,8 +3330,8 @@
              names.add(languageName);
          }
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/PriorityQueue.java openjdk-boot/jdk/src/share/classes/java/util/PriorityQueue.java
---- openjdk-boot.orig/jdk/src/share/classes/java/util/PriorityQueue.java	2012-02-08 19:36:21.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/java/util/PriorityQueue.java	2013-09-20 00:33:52.248645936 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/util/PriorityQueue.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/java/util/PriorityQueue.java	2013-12-26 22:23:06.706103735 +0000
 @@ -538,7 +538,7 @@
                      cursor--;
                  else {
@@ -3257,8 +3342,8 @@
                  }
              } else if (lastRetElt != null) {
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/Properties.java openjdk-boot/jdk/src/share/classes/java/util/Properties.java
---- openjdk-boot.orig/jdk/src/share/classes/java/util/Properties.java	2012-02-08 19:36:21.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/java/util/Properties.java	2013-09-20 00:33:52.248645936 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/util/Properties.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/java/util/Properties.java	2013-12-26 22:23:06.706103735 +0000
 @@ -1010,7 +1010,7 @@
       * @since   1.6
       */
@@ -3269,8 +3354,8 @@
          return h.keySet();
      }
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/RegularEnumSet.java openjdk-boot/jdk/src/share/classes/java/util/RegularEnumSet.java
---- openjdk-boot.orig/jdk/src/share/classes/java/util/RegularEnumSet.java	2012-02-08 19:36:21.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/java/util/RegularEnumSet.java	2013-09-20 00:33:52.252645998 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/util/RegularEnumSet.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/java/util/RegularEnumSet.java	2013-12-26 22:23:06.706103735 +0000
 @@ -72,7 +72,7 @@
       * @return an iterator over the elements contained in this set
       */
@@ -3281,8 +3366,8 @@
  
      private class EnumSetIterator<E extends Enum<E>> implements Iterator<E> {
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/ResourceBundle.java openjdk-boot/jdk/src/share/classes/java/util/ResourceBundle.java
---- openjdk-boot.orig/jdk/src/share/classes/java/util/ResourceBundle.java	2013-07-08 21:17:47.659630049 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/util/ResourceBundle.java	2013-09-20 00:33:52.252645998 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/util/ResourceBundle.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/java/util/ResourceBundle.java	2013-12-26 22:23:06.706103735 +0000
 @@ -291,7 +291,7 @@
       * name for compatibility with some workarounds for bug 4212439.
       */
@@ -3347,8 +3432,8 @@
                  if (variants != null) {
                      for (String v : variants) {
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/ServiceLoader.java openjdk-boot/jdk/src/share/classes/java/util/ServiceLoader.java
---- openjdk-boot.orig/jdk/src/share/classes/java/util/ServiceLoader.java	2012-11-30 07:40:06.379159872 +0000
-+++ openjdk-boot/jdk/src/share/classes/java/util/ServiceLoader.java	2013-09-20 00:33:52.252645998 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/util/ServiceLoader.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/java/util/ServiceLoader.java	2013-12-26 22:23:06.706103735 +0000
 @@ -191,7 +191,7 @@
      private ClassLoader loader;
  
@@ -3377,8 +3462,8 @@
  
      /**
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/TimSort.java openjdk-boot/jdk/src/share/classes/java/util/TimSort.java
---- openjdk-boot.orig/jdk/src/share/classes/java/util/TimSort.java	2012-02-08 19:36:21.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/java/util/TimSort.java	2013-09-20 00:33:52.252645998 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/util/TimSort.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/java/util/TimSort.java	2013-12-26 22:23:06.706103735 +0000
 @@ -196,7 +196,7 @@
           * extending short natural runs to minRun elements, and merging runs
           * to maintain stack invariant.
@@ -3389,8 +3474,8 @@
          do {
              // Identify next run
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/TreeMap.java openjdk-boot/jdk/src/share/classes/java/util/TreeMap.java
---- openjdk-boot.orig/jdk/src/share/classes/java/util/TreeMap.java	2012-02-08 19:36:22.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/java/util/TreeMap.java	2013-09-20 00:33:52.252645998 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/util/TreeMap.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/java/util/TreeMap.java	2013-12-26 22:23:06.706103735 +0000
 @@ -530,7 +530,7 @@
          if (t == null) {
              compare(key, key); // type (and possibly null) check
@@ -3446,8 +3531,8 @@
          // color nodes in non-full bottommost level red
          if (level == redLevel)
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/TreeSet.java openjdk-boot/jdk/src/share/classes/java/util/TreeSet.java
---- openjdk-boot.orig/jdk/src/share/classes/java/util/TreeSet.java	2012-02-08 19:36:22.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/java/util/TreeSet.java	2013-09-20 00:33:52.252645998 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/util/TreeSet.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/java/util/TreeSet.java	2013-12-26 22:23:06.706103735 +0000
 @@ -138,7 +138,7 @@
       *        ordering} of the elements will be used.
       */
@@ -3515,8 +3600,8 @@
  
          // Read in size
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/WeakHashMap.java openjdk-boot/jdk/src/share/classes/java/util/WeakHashMap.java
---- openjdk-boot.orig/jdk/src/share/classes/java/util/WeakHashMap.java	2012-11-30 07:40:06.383159935 +0000
-+++ openjdk-boot/jdk/src/share/classes/java/util/WeakHashMap.java	2013-09-20 00:33:52.252645998 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/util/WeakHashMap.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/java/util/WeakHashMap.java	2013-12-26 22:23:06.706103735 +0000
 @@ -172,7 +172,7 @@
      /**
       * Reference queue for cleared WeakEntries
@@ -3549,8 +3634,8 @@
          }
  
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/logging/FileHandler.java openjdk-boot/jdk/src/share/classes/java/util/logging/FileHandler.java
---- openjdk-boot.orig/jdk/src/share/classes/java/util/logging/FileHandler.java	2012-11-30 07:40:06.395160129 +0000
-+++ openjdk-boot/jdk/src/share/classes/java/util/logging/FileHandler.java	2013-09-20 00:33:52.248645936 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/util/logging/FileHandler.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/java/util/logging/FileHandler.java	2013-12-26 22:23:06.706103735 +0000
 @@ -127,7 +127,7 @@
      private FileOutputStream lockStream;
      private File files[];
@@ -3561,8 +3646,8 @@
      // A metered stream is a subclass of OutputStream that
      //   (a) forwards all its output to a target stream
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/logging/Level.java openjdk-boot/jdk/src/share/classes/java/util/logging/Level.java
---- openjdk-boot.orig/jdk/src/share/classes/java/util/logging/Level.java	2013-09-19 18:15:14.492775932 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/util/logging/Level.java	2013-09-20 00:33:52.248645936 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/util/logging/Level.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/java/util/logging/Level.java	2013-12-26 22:23:06.706103735 +0000
 @@ -518,8 +518,8 @@
      // were final, the following KnownLevel implementation can be removed.
      // Future API change should take this into consideration.
@@ -3592,8 +3677,8 @@
              }
              list.add(o);
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/logging/LogManager.java openjdk-boot/jdk/src/share/classes/java/util/logging/LogManager.java
---- openjdk-boot.orig/jdk/src/share/classes/java/util/logging/LogManager.java	2013-09-19 18:15:14.496775994 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/util/logging/LogManager.java	2013-09-20 00:34:21.509101567 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/util/logging/LogManager.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/java/util/logging/LogManager.java	2013-12-26 22:23:06.706103735 +0000
 @@ -384,7 +384,7 @@
      }
  
@@ -3640,8 +3725,8 @@
              int end = ix;
              while (end < hands.length()) {
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/logging/LogRecord.java openjdk-boot/jdk/src/share/classes/java/util/logging/LogRecord.java
---- openjdk-boot.orig/jdk/src/share/classes/java/util/logging/LogRecord.java	2012-02-08 19:36:24.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/java/util/logging/LogRecord.java	2013-09-20 00:33:52.248645936 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/util/logging/LogRecord.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/java/util/logging/LogRecord.java	2013-12-26 22:23:06.706103735 +0000
 @@ -85,7 +85,8 @@
      private static final AtomicInteger nextThreadId
          = new AtomicInteger(MIN_SEQUENTIAL_THREAD_ID);
@@ -3653,8 +3738,8 @@
      /**
       * @serial Logging message level
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/logging/Logger.java openjdk-boot/jdk/src/share/classes/java/util/logging/Logger.java
---- openjdk-boot.orig/jdk/src/share/classes/java/util/logging/Logger.java	2013-07-08 21:17:47.703630748 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/util/logging/Logger.java	2013-09-20 00:33:52.248645936 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/util/logging/Logger.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/java/util/logging/Logger.java	2013-12-26 22:23:06.706103735 +0000
 @@ -177,7 +177,7 @@
      private LogManager manager;
      private String name;
@@ -3664,7 +3749,7 @@
      private String resourceBundleName;
      private volatile boolean useParentHandlers = true;
      private volatile Filter filter;
-@@ -1591,7 +1591,7 @@
+@@ -1594,7 +1594,7 @@
              // Set our new parent.
              parent = newParent;
              if (parent.kids == null) {
@@ -3674,8 +3759,8 @@
              if (ref == null) {
                  // we didn't have a previous parent
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/logging/Logging.java openjdk-boot/jdk/src/share/classes/java/util/logging/Logging.java
---- openjdk-boot.orig/jdk/src/share/classes/java/util/logging/Logging.java	2013-04-03 01:24:48.358098731 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/util/logging/Logging.java	2013-09-20 00:33:52.248645936 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/util/logging/Logging.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/java/util/logging/Logging.java	2013-12-26 22:23:06.706103735 +0000
 @@ -56,7 +56,7 @@
  
      public List<String> getLoggerNames() {
@@ -3686,8 +3771,8 @@
          for (; loggers.hasMoreElements();) {
              array.add((String) loggers.nextElement());
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/prefs/AbstractPreferences.java openjdk-boot/jdk/src/share/classes/java/util/prefs/AbstractPreferences.java
---- openjdk-boot.orig/jdk/src/share/classes/java/util/prefs/AbstractPreferences.java	2012-02-08 19:36:25.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/java/util/prefs/AbstractPreferences.java	2013-09-20 00:33:52.248645936 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/util/prefs/AbstractPreferences.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/java/util/prefs/AbstractPreferences.java	2013-12-26 22:23:06.710103797 +0000
 @@ -155,7 +155,8 @@
       * All known unremoved children of this node.  (This "cache" is consulted
       * prior to calling childSpi() or getChild().
@@ -3718,8 +3803,8 @@
      /**
       * These two classes are used to distinguish NodeChangeEvents on
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/regex/Pattern.java openjdk-boot/jdk/src/share/classes/java/util/regex/Pattern.java
---- openjdk-boot.orig/jdk/src/share/classes/java/util/regex/Pattern.java	2012-02-08 19:36:25.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/java/util/regex/Pattern.java	2013-09-20 00:33:52.252645998 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/util/regex/Pattern.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/java/util/regex/Pattern.java	2013-12-26 22:23:06.710103797 +0000
 @@ -321,7 +321,7 @@
   *     <td headers="matches">Nothing, but quotes all characters until <tt>\E</tt></td></tr>
   * <tr><td valign="top" headers="construct quot"><tt>\E</tt></td>
@@ -3757,8 +3842,8 @@
          static {
              // Unicode character property aliases, defined in
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/regex/UnicodeProp.java openjdk-boot/jdk/src/share/classes/java/util/regex/UnicodeProp.java
---- openjdk-boot.orig/jdk/src/share/classes/java/util/regex/UnicodeProp.java	2012-02-08 19:36:25.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/java/util/regex/UnicodeProp.java	2013-09-20 00:33:52.252645998 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/util/regex/UnicodeProp.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/java/util/regex/UnicodeProp.java	2013-12-26 22:23:06.710103797 +0000
 @@ -193,8 +193,8 @@
          }
      };
@@ -3771,8 +3856,8 @@
          posix.put("ALPHA", "ALPHABETIC");
          posix.put("LOWER", "LOWERCASE");
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/zip/ZipFile.java openjdk-boot/jdk/src/share/classes/java/util/zip/ZipFile.java
---- openjdk-boot.orig/jdk/src/share/classes/java/util/zip/ZipFile.java	2013-07-08 21:17:47.707630811 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/util/zip/ZipFile.java	2013-09-20 00:33:52.252645998 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/util/zip/ZipFile.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/java/util/zip/ZipFile.java	2013-12-26 22:23:06.710103797 +0000
 @@ -321,7 +321,7 @@
  
      // the outstanding inputstreams that need to be closed,
@@ -3801,8 +3886,8 @@
                      for (Map.Entry<InputStream, Inflater> e : copy.entrySet()) {
                          e.getKey().close();
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/zip/ZipOutputStream.java openjdk-boot/jdk/src/share/classes/java/util/zip/ZipOutputStream.java
---- openjdk-boot.orig/jdk/src/share/classes/java/util/zip/ZipOutputStream.java	2012-02-08 19:36:25.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/java/util/zip/ZipOutputStream.java	2013-09-20 00:33:52.252645998 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/util/zip/ZipOutputStream.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/java/util/zip/ZipOutputStream.java	2013-12-26 22:23:06.710103797 +0000
 @@ -53,8 +53,8 @@
      }
  
@@ -3815,8 +3900,8 @@
      private long written = 0;
      private long locoff = 0;
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/javax/crypto/CryptoPermissions.java openjdk-boot/jdk/src/share/classes/javax/crypto/CryptoPermissions.java
---- openjdk-boot.orig/jdk/src/share/classes/javax/crypto/CryptoPermissions.java	2012-09-24 19:25:56.970006858 +0100
-+++ openjdk-boot/jdk/src/share/classes/javax/crypto/CryptoPermissions.java	2013-09-20 00:33:52.252645998 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/javax/crypto/CryptoPermissions.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/javax/crypto/CryptoPermissions.java	2013-12-26 22:23:06.710103797 +0000
 @@ -84,7 +84,7 @@
       * no CryptoPermissionCollections.
       */
@@ -3855,8 +3940,8 @@
          fields.put("perms", permTable);
          s.writeFields();
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/javax/crypto/JceSecurityManager.java openjdk-boot/jdk/src/share/classes/javax/crypto/JceSecurityManager.java
---- openjdk-boot.orig/jdk/src/share/classes/javax/crypto/JceSecurityManager.java	2012-09-24 19:25:56.970006858 +0100
-+++ openjdk-boot/jdk/src/share/classes/javax/crypto/JceSecurityManager.java	2013-09-20 00:33:52.252645998 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/javax/crypto/JceSecurityManager.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/javax/crypto/JceSecurityManager.java	2013-12-26 22:23:06.710103797 +0000
 @@ -54,7 +54,7 @@
      private static final CryptoAllPermission allPerm;
      private static final Vector TrustedCallersCache = new Vector(2);
@@ -3867,8 +3952,8 @@
              new CryptoPermissions();
  
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/javax/security/auth/PrivateCredentialPermission.java openjdk-boot/jdk/src/share/classes/javax/security/auth/PrivateCredentialPermission.java
---- openjdk-boot.orig/jdk/src/share/classes/javax/security/auth/PrivateCredentialPermission.java	2012-02-08 19:36:41.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/javax/security/auth/PrivateCredentialPermission.java	2013-09-20 00:33:52.252645998 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/javax/security/auth/PrivateCredentialPermission.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/javax/security/auth/PrivateCredentialPermission.java	2013-12-26 22:23:06.710103797 +0000
 @@ -329,7 +329,7 @@
              throw new IllegalArgumentException("invalid empty name");
          }
@@ -3879,8 +3964,8 @@
          String principalClass = null;
          String principalName = null;
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/javax/security/auth/SubjectDomainCombiner.java openjdk-boot/jdk/src/share/classes/javax/security/auth/SubjectDomainCombiner.java
---- openjdk-boot.orig/jdk/src/share/classes/javax/security/auth/SubjectDomainCombiner.java	2012-02-08 19:36:41.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/javax/security/auth/SubjectDomainCombiner.java	2013-09-20 00:33:52.252645998 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/javax/security/auth/SubjectDomainCombiner.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/javax/security/auth/SubjectDomainCombiner.java	2013-12-26 22:23:06.710103797 +0000
 @@ -48,7 +48,7 @@
  
      private Subject subject;
@@ -3891,8 +3976,8 @@
      private Principal[] principals;
  
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/javax/security/auth/kerberos/DelegationPermission.java openjdk-boot/jdk/src/share/classes/javax/security/auth/kerberos/DelegationPermission.java
---- openjdk-boot.orig/jdk/src/share/classes/javax/security/auth/kerberos/DelegationPermission.java	2012-02-08 19:36:41.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/javax/security/auth/kerberos/DelegationPermission.java	2013-09-20 00:33:52.252645998 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/javax/security/auth/kerberos/DelegationPermission.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/javax/security/auth/kerberos/DelegationPermission.java	2013-12-26 22:23:06.710103797 +0000
 @@ -361,7 +361,7 @@
          // Don't call out.defaultWriteObject()
  
@@ -3903,8 +3988,8 @@
          synchronized (this) {
              permissions.addAll(perms);
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/javax/security/auth/kerberos/ServicePermission.java openjdk-boot/jdk/src/share/classes/javax/security/auth/kerberos/ServicePermission.java
---- openjdk-boot.orig/jdk/src/share/classes/javax/security/auth/kerberos/ServicePermission.java	2012-02-08 19:36:41.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/javax/security/auth/kerberos/ServicePermission.java	2013-09-20 00:33:52.252645998 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/javax/security/auth/kerberos/ServicePermission.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/javax/security/auth/kerberos/ServicePermission.java	2013-12-26 22:23:06.710103797 +0000
 @@ -569,7 +569,7 @@
          // Don't call out.defaultWriteObject()
  
@@ -3915,8 +4000,8 @@
          synchronized (this) {
              permissions.addAll(perms);
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/font/CreatedFontTracker.java openjdk-boot/jdk/src/share/classes/sun/font/CreatedFontTracker.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/font/CreatedFontTracker.java	2013-07-08 21:17:48.115637300 +0100
-+++ openjdk-boot/jdk/src/share/classes/sun/font/CreatedFontTracker.java	2013-09-20 00:33:52.252645998 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/sun/font/CreatedFontTracker.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/font/CreatedFontTracker.java	2013-12-26 22:23:06.710103797 +0000
 @@ -106,7 +106,7 @@
       * Note that this only applies to createFont() from an InputStream object.
       */
@@ -3927,8 +4012,8 @@
          private static Thread t = null;
          static void init() {
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/invoke/util/ValueConversions.java openjdk-boot/jdk/src/share/classes/sun/invoke/util/ValueConversions.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/invoke/util/ValueConversions.java	2013-09-20 00:32:37.195477183 +0100
-+++ openjdk-boot/jdk/src/share/classes/sun/invoke/util/ValueConversions.java	2013-09-20 00:33:52.256646060 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/sun/invoke/util/ValueConversions.java	2013-12-26 22:21:55.925022305 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/invoke/util/ValueConversions.java	2013-12-26 22:23:06.710103797 +0000
 @@ -60,7 +60,7 @@
          EnumMap<Wrapper, MethodHandle>[] caches
                  = (EnumMap<Wrapper, MethodHandle>[]) new EnumMap<?,?>[n];
@@ -3966,8 +4051,8 @@
              MethodHandle mh = findCollector("list", mhs.size(), List.class);
              if (mh == null)  break;
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/io/CharacterEncoding.java openjdk-boot/jdk/src/share/classes/sun/io/CharacterEncoding.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/io/CharacterEncoding.java	2012-02-08 19:37:17.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/sun/io/CharacterEncoding.java	2013-09-20 00:33:52.256646060 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/sun/io/CharacterEncoding.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/io/CharacterEncoding.java	2013-12-26 22:23:06.710103797 +0000
 @@ -54,7 +54,7 @@
      private static volatile boolean installedAll;
  
@@ -3978,8 +4063,8 @@
          aliasTable.put("us-ascii",              "ASCII");
          aliasTable.put("ascii",                 "ASCII");
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/io/Converters.java openjdk-boot/jdk/src/share/classes/sun/io/Converters.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/io/Converters.java	2012-02-08 19:37:17.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/sun/io/Converters.java	2013-09-20 00:33:52.256646060 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/sun/io/Converters.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/io/Converters.java	2013-12-26 22:23:06.710103797 +0000
 @@ -120,7 +120,7 @@
  
      private static Class<?> cache(int type, Object encoding, Class<?> c) {
@@ -3990,8 +4075,8 @@
          return c;
      }
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/launcher/LauncherHelper.java openjdk-boot/jdk/src/share/classes/sun/launcher/LauncherHelper.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/launcher/LauncherHelper.java	2013-09-20 00:32:35.743454570 +0100
-+++ openjdk-boot/jdk/src/share/classes/sun/launcher/LauncherHelper.java	2013-09-20 00:33:52.256646060 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/sun/launcher/LauncherHelper.java	2013-12-26 22:21:55.893021816 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/launcher/LauncherHelper.java	2013-12-26 22:23:06.710103797 +0000
 @@ -171,7 +171,7 @@
      private static void printProperties(PrintStream ostream) {
          Properties p = System.getProperties();
@@ -4029,8 +4114,8 @@
              System.err.println("Incoming arguments:");
          }
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/management/ManagementFactoryHelper.java openjdk-boot/jdk/src/share/classes/sun/management/ManagementFactoryHelper.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/management/ManagementFactoryHelper.java	2012-09-24 16:16:01.680936450 +0100
-+++ openjdk-boot/jdk/src/share/classes/sun/management/ManagementFactoryHelper.java	2013-09-20 00:33:52.256646060 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/sun/management/ManagementFactoryHelper.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/management/ManagementFactoryHelper.java	2013-12-26 22:23:06.710103797 +0000
 @@ -205,7 +205,7 @@
      private static List<BufferPoolMXBean> bufferPools = null;
      public static synchronized List<BufferPoolMXBean> getBufferPoolMXBeans() {
@@ -4041,8 +4126,8 @@
                  .getDirectBufferPool()));
              bufferPools.add(createBufferPoolMXBean(sun.nio.ch.FileChannelImpl
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/management/jdp/JdpPacketReader.java openjdk-boot/jdk/src/share/classes/sun/management/jdp/JdpPacketReader.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/management/jdp/JdpPacketReader.java	2013-04-03 01:24:48.650103311 +0100
-+++ openjdk-boot/jdk/src/share/classes/sun/management/jdp/JdpPacketReader.java	2013-09-20 00:33:52.256646060 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/sun/management/jdp/JdpPacketReader.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/management/jdp/JdpPacketReader.java	2013-12-26 22:23:06.710103797 +0000
 @@ -120,7 +120,7 @@
  
          String key = null, value = null;
@@ -4053,8 +4138,8 @@
              while (true) {
                  key = getEntry();
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/net/spi/nameservice/dns/DNSNameService.java openjdk-boot/jdk/src/share/classes/sun/net/spi/nameservice/dns/DNSNameService.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/net/spi/nameservice/dns/DNSNameService.java	2012-02-08 19:37:29.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/sun/net/spi/nameservice/dns/DNSNameService.java	2013-09-20 00:33:52.256646060 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/sun/net/spi/nameservice/dns/DNSNameService.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/net/spi/nameservice/dns/DNSNameService.java	2013-12-26 22:23:06.710103797 +0000
 @@ -52,7 +52,7 @@
  
      // Per-thread soft cache of the last temporary context
@@ -4083,8 +4168,8 @@
  
          // do the query
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/net/www/URLConnection.java openjdk-boot/jdk/src/share/classes/sun/net/www/URLConnection.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/net/www/URLConnection.java	2012-02-08 19:37:30.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/sun/net/www/URLConnection.java	2013-09-20 00:33:52.256646060 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/sun/net/www/URLConnection.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/net/www/URLConnection.java	2013-12-26 22:23:06.710103797 +0000
 @@ -239,7 +239,7 @@
          url = null;
      }
@@ -4095,8 +4180,8 @@
      public synchronized static void setProxiedHost(String host) {
          proxiedHosts.put(host.toLowerCase(), null);
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/net/www/protocol/http/AuthenticationInfo.java openjdk-boot/jdk/src/share/classes/sun/net/www/protocol/http/AuthenticationInfo.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/net/www/protocol/http/AuthenticationInfo.java	2012-02-08 19:37:30.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/sun/net/www/protocol/http/AuthenticationInfo.java	2013-09-20 00:33:52.256646060 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/sun/net/www/protocol/http/AuthenticationInfo.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/net/www/protocol/http/AuthenticationInfo.java	2013-12-26 22:23:06.710103797 +0000
 @@ -111,7 +111,7 @@
       * at the same time, then all but the first will block until
       * the first completes its authentication.
@@ -4107,8 +4192,8 @@
      /* check if a request for this destination is in progress
       * return false immediately if not. Otherwise block until
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/net/www/protocol/http/HttpURLConnection.java openjdk-boot/jdk/src/share/classes/sun/net/www/protocol/http/HttpURLConnection.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/net/www/protocol/http/HttpURLConnection.java	2013-04-03 01:24:48.670103624 +0100
-+++ openjdk-boot/jdk/src/share/classes/sun/net/www/protocol/http/HttpURLConnection.java	2013-09-20 00:33:52.256646060 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/sun/net/www/protocol/http/HttpURLConnection.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/net/www/protocol/http/HttpURLConnection.java	2013-12-26 22:23:06.714103858 +0000
 @@ -2646,7 +2646,7 @@
          if (filteredHeaders != null)
              return filteredHeaders;
@@ -4128,8 +4213,8 @@
                  String fVal = filterHeaderField(key, value);
                  if (fVal != null)
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/nio/cs/AbstractCharsetProvider.java openjdk-boot/jdk/src/share/classes/sun/nio/cs/AbstractCharsetProvider.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/nio/cs/AbstractCharsetProvider.java	2012-09-24 16:16:01.696936747 +0100
-+++ openjdk-boot/jdk/src/share/classes/sun/nio/cs/AbstractCharsetProvider.java	2013-09-20 00:33:52.256646060 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/sun/nio/cs/AbstractCharsetProvider.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/nio/cs/AbstractCharsetProvider.java	2013-12-26 22:23:06.714103858 +0000
 @@ -49,22 +49,22 @@
      /* Maps canonical names to class names
       */
@@ -4167,8 +4252,8 @@
  
          return new Iterator<Charset>() {
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/AbstractAclFileAttributeView.java openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractAclFileAttributeView.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/AbstractAclFileAttributeView.java	2012-02-08 19:37:35.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractAclFileAttributeView.java	2013-09-20 00:33:52.256646060 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/AbstractAclFileAttributeView.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractAclFileAttributeView.java	2013-12-26 22:23:06.714103858 +0000
 @@ -84,7 +84,7 @@
              throw new IllegalArgumentException("'" + name() + ":" +
                  attribute + "' not recognized");
@@ -4179,8 +4264,8 @@
              result.put(ACL_NAME, getAcl());
          if (owner)
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/AbstractBasicFileAttributeView.java openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractBasicFileAttributeView.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/AbstractBasicFileAttributeView.java	2012-02-08 19:37:35.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractBasicFileAttributeView.java	2013-09-20 00:33:52.256646060 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/AbstractBasicFileAttributeView.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractBasicFileAttributeView.java	2013-12-26 22:23:06.714103858 +0000
 @@ -89,8 +89,8 @@
       * Used to build a map of attribute name/values.
       */
@@ -4193,8 +4278,8 @@
  
          private AttributesBuilder(Set<String> allowed, String[] requested) {
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/AbstractPoller.java openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractPoller.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/AbstractPoller.java	2012-02-08 19:37:35.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractPoller.java	2013-09-20 00:33:52.256646060 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/AbstractPoller.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractPoller.java	2013-12-26 22:23:06.714103858 +0000
 @@ -102,7 +102,7 @@
              throw new NullPointerException();
          if (events.length == 0)
@@ -4205,8 +4290,8 @@
              // standard events
              if (event == StandardWatchEventKinds.ENTRY_CREATE ||
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/AbstractUserDefinedFileAttributeView.java openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractUserDefinedFileAttributeView.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/AbstractUserDefinedFileAttributeView.java	2012-02-08 19:37:35.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractUserDefinedFileAttributeView.java	2013-09-20 00:33:52.256646060 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/AbstractUserDefinedFileAttributeView.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractUserDefinedFileAttributeView.java	2013-12-26 22:23:06.714103858 +0000
 @@ -77,7 +77,7 @@
          throws IOException
      {
@@ -4226,8 +4311,8 @@
              int size = size(name);
              byte[] buf = new byte[size];
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/FileOwnerAttributeViewImpl.java openjdk-boot/jdk/src/share/classes/sun/nio/fs/FileOwnerAttributeViewImpl.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/FileOwnerAttributeViewImpl.java	2012-02-08 19:37:35.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/FileOwnerAttributeViewImpl.java	2013-09-20 00:33:52.256646060 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/FileOwnerAttributeViewImpl.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/FileOwnerAttributeViewImpl.java	2013-12-26 22:23:06.714103858 +0000
 @@ -71,7 +71,7 @@
  
      @Override
@@ -4238,8 +4323,8 @@
              if (attribute.equals("*") || attribute.equals(OWNER_NAME)) {
                  result.put(OWNER_NAME, getOwner());
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/Util.java openjdk-boot/jdk/src/share/classes/sun/nio/fs/Util.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/Util.java	2012-02-08 19:37:35.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/Util.java	2013-09-20 00:33:52.256646060 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/Util.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/Util.java	2013-12-26 22:23:06.714103858 +0000
 @@ -63,7 +63,7 @@
       * Returns a Set containing the given elements.
       */
@@ -4259,8 +4344,8 @@
              set.add(e);
          }
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/reflect/generics/parser/SignatureParser.java openjdk-boot/jdk/src/share/classes/sun/reflect/generics/parser/SignatureParser.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/reflect/generics/parser/SignatureParser.java	2012-09-24 16:16:01.708936971 +0100
-+++ openjdk-boot/jdk/src/share/classes/sun/reflect/generics/parser/SignatureParser.java	2013-09-20 00:33:52.256646060 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/sun/reflect/generics/parser/SignatureParser.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/reflect/generics/parser/SignatureParser.java	2013-12-26 22:23:06.714103858 +0000
 @@ -229,7 +229,7 @@
       *     "<" FormalTypeParameter+ ">"
       */
@@ -4325,8 +4410,8 @@
              ets.add(parseThrowsSignature());
          }
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/registry/RegistryImpl.java openjdk-boot/jdk/src/share/classes/sun/rmi/registry/RegistryImpl.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/registry/RegistryImpl.java	2013-01-14 03:19:03.473020572 +0000
-+++ openjdk-boot/jdk/src/share/classes/sun/rmi/registry/RegistryImpl.java	2013-09-20 00:33:52.256646060 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/registry/RegistryImpl.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/rmi/registry/RegistryImpl.java	2013-12-26 22:23:06.714103858 +0000
 @@ -78,9 +78,9 @@
      /* indicate compatibility with JDK 1.1.x version of class */
      private static final long serialVersionUID = 4666870661827494597L;
@@ -4340,8 +4425,8 @@
      private static ObjID id = new ObjID(ObjID.REGISTRY_ID);
  
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/rmic/BatchEnvironment.java openjdk-boot/jdk/src/share/classes/sun/rmi/rmic/BatchEnvironment.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/rmic/BatchEnvironment.java	2013-01-14 03:19:03.533021549 +0000
-+++ openjdk-boot/jdk/src/share/classes/sun/rmi/rmic/BatchEnvironment.java	2013-09-20 00:33:52.256646060 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/rmic/BatchEnvironment.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/rmi/rmic/BatchEnvironment.java	2013-12-26 22:23:06.714103858 +0000
 @@ -160,7 +160,7 @@
      }
  
@@ -4352,8 +4437,8 @@
      /**
       * Remember a generated source file generated so that it
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/rmic/Main.java openjdk-boot/jdk/src/share/classes/sun/rmi/rmic/Main.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/rmic/Main.java	2013-01-14 03:19:03.557021940 +0000
-+++ openjdk-boot/jdk/src/share/classes/sun/rmi/rmic/Main.java	2013-09-20 00:33:52.256646060 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/rmic/Main.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/rmi/rmic/Main.java	2013-12-26 22:23:06.714103858 +0000
 @@ -184,7 +184,7 @@
          destDir = null;
          flags = F_WARNINGS;
@@ -4373,8 +4458,8 @@
          // Pre-process command line for @file arguments
          try {
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/rmic/RMIGenerator.java openjdk-boot/jdk/src/share/classes/sun/rmi/rmic/RMIGenerator.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/rmic/RMIGenerator.java	2013-01-14 03:19:03.557021940 +0000
-+++ openjdk-boot/jdk/src/share/classes/sun/rmi/rmic/RMIGenerator.java	2013-09-20 00:33:52.256646060 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/rmic/RMIGenerator.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/rmi/rmic/RMIGenerator.java	2013-12-26 22:23:06.714103858 +0000
 @@ -61,7 +61,7 @@
   */
  public class RMIGenerator implements RMIConstants, Generator {
@@ -4394,8 +4479,8 @@
          uniqueList.addElement(defRuntimeException);
          uniqueList.addElement(defRemoteException);
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/Activation.java openjdk-boot/jdk/src/share/classes/sun/rmi/server/Activation.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/Activation.java	2013-09-20 00:32:35.747454633 +0100
-+++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/Activation.java	2013-09-20 00:33:52.260646123 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/Activation.java	2013-12-26 22:21:55.897021877 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/Activation.java	2013-12-26 22:23:06.714103858 +0000
 @@ -149,10 +149,10 @@
  
      /** maps activation id to its respective group id */
@@ -4452,8 +4537,8 @@
              /*
               * Parse arguments
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/ActivationGroupImpl.java openjdk-boot/jdk/src/share/classes/sun/rmi/server/ActivationGroupImpl.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/ActivationGroupImpl.java	2013-09-20 00:32:35.451450023 +0100
-+++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/ActivationGroupImpl.java	2013-09-20 00:33:52.256646060 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/ActivationGroupImpl.java	2013-12-26 22:21:55.849021144 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/ActivationGroupImpl.java	2013-12-26 22:23:06.714103858 +0000
 @@ -66,10 +66,10 @@
  
      /** maps persistent IDs to activated remote objects */
@@ -4468,8 +4553,8 @@
      /**
       * Creates a default activation group implementation.
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/LoaderHandler.java openjdk-boot/jdk/src/share/classes/sun/rmi/server/LoaderHandler.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/LoaderHandler.java	2013-09-20 00:32:35.451450023 +0100
-+++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/LoaderHandler.java	2013-09-20 00:33:52.260646123 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/LoaderHandler.java	2013-12-26 22:21:55.849021144 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/LoaderHandler.java	2013-12-26 22:23:06.714103858 +0000
 @@ -113,11 +113,11 @@
       * garbage collected.
       */
@@ -4494,8 +4579,8 @@
      /**
       * Convert an array of URL objects into a corresponding string
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/MarshalInputStream.java openjdk-boot/jdk/src/share/classes/sun/rmi/server/MarshalInputStream.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/MarshalInputStream.java	2013-04-23 21:48:04.152606211 +0100
-+++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/MarshalInputStream.java	2013-09-20 00:33:52.260646123 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/MarshalInputStream.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/MarshalInputStream.java	2013-12-26 22:23:06.714103858 +0000
 @@ -71,14 +71,14 @@
  
      /** table to hold sun classes to which access is explicitly permitted */
@@ -4514,8 +4599,8 @@
      /**
       * if true, load classes (if not available locally) only from the
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/UnicastServerRef.java openjdk-boot/jdk/src/share/classes/sun/rmi/server/UnicastServerRef.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/UnicastServerRef.java	2013-01-14 03:19:03.585022396 +0000
-+++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/UnicastServerRef.java	2013-09-20 00:33:52.260646123 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/UnicastServerRef.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/UnicastServerRef.java	2013-12-26 22:23:06.714103858 +0000
 @@ -537,7 +537,7 @@
          HashToMethod_Maps() {}
  
@@ -4526,8 +4611,8 @@
                   cl != null;
                   cl = cl.getSuperclass())
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/Util.java openjdk-boot/jdk/src/share/classes/sun/rmi/server/Util.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/Util.java	2013-01-14 03:19:03.593022526 +0000
-+++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/Util.java	2013-09-20 00:33:52.260646123 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/Util.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/Util.java	2013-12-26 22:23:06.714103858 +0000
 @@ -207,7 +207,7 @@
       * @throws  NullPointerException if remoteClass is null
       */
@@ -4538,8 +4623,8 @@
          return list.toArray(new Class<?>[list.size()]);
      }
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/WeakClassHashMap.java openjdk-boot/jdk/src/share/classes/sun/rmi/server/WeakClassHashMap.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/WeakClassHashMap.java	2013-01-14 03:19:03.597022591 +0000
-+++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/WeakClassHashMap.java	2013-09-20 00:33:52.260646123 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/WeakClassHashMap.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/WeakClassHashMap.java	2013-12-26 22:23:06.714103858 +0000
 @@ -46,7 +46,7 @@
   **/
  public abstract class WeakClassHashMap<V> {
@@ -4550,8 +4635,8 @@
      protected WeakClassHashMap() { }
  
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/ConnectionInputStream.java openjdk-boot/jdk/src/share/classes/sun/rmi/transport/ConnectionInputStream.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/ConnectionInputStream.java	2013-01-14 03:19:03.601022657 +0000
-+++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/ConnectionInputStream.java	2013-09-20 00:33:52.260646123 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/ConnectionInputStream.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/ConnectionInputStream.java	2013-12-26 22:23:06.714103858 +0000
 @@ -43,7 +43,7 @@
      private boolean dgcAckNeeded = false;
  
@@ -4562,8 +4647,8 @@
      /** identifier for gc ack*/
      private UID ackID;
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/DGCAckHandler.java openjdk-boot/jdk/src/share/classes/sun/rmi/transport/DGCAckHandler.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/DGCAckHandler.java	2013-01-14 03:19:03.601022657 +0000
-+++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/DGCAckHandler.java	2013-09-20 00:33:52.260646123 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/DGCAckHandler.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/DGCAckHandler.java	2013-12-26 22:23:06.714103858 +0000
 @@ -78,7 +78,7 @@
          Collections.synchronizedMap(new HashMap<UID,DGCAckHandler>());
  
@@ -4574,8 +4659,8 @@
  
      /**
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/DGCClient.java openjdk-boot/jdk/src/share/classes/sun/rmi/transport/DGCClient.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/DGCClient.java	2013-01-14 03:19:03.605022721 +0000
-+++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/DGCClient.java	2013-09-20 00:33:52.260646123 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/DGCClient.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/DGCClient.java	2013-12-26 22:23:06.718103919 +0000
 @@ -176,9 +176,9 @@
          private DGC dgc;
  
@@ -4647,8 +4732,8 @@
              private boolean dirtyFailed = false;
  
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/DGCImpl.java openjdk-boot/jdk/src/share/classes/sun/rmi/transport/DGCImpl.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/DGCImpl.java	2013-01-14 03:19:03.617022918 +0000
-+++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/DGCImpl.java	2013-09-20 00:33:52.260646123 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/DGCImpl.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/DGCImpl.java	2013-12-26 22:23:06.718103919 +0000
 @@ -84,7 +84,7 @@
      /** remote implementation of DGC interface for this VM */
      private static DGCImpl dgc;
@@ -4677,8 +4762,8 @@
          LeaseInfo(VMID vmid, long lease) {
              this.vmid = vmid;
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/ObjectTable.java openjdk-boot/jdk/src/share/classes/sun/rmi/transport/ObjectTable.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/ObjectTable.java	2013-01-14 03:19:03.617022918 +0000
-+++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/ObjectTable.java	2013-09-20 00:33:52.260646123 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/ObjectTable.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/ObjectTable.java	2013-12-26 22:23:06.718103919 +0000
 @@ -62,9 +62,9 @@
  
      /** tables mapping to Target, keyed from ObjectEndpoint and impl object */
@@ -4701,8 +4786,8 @@
      /** handle for GC latency request (for future cancellation) */
      private static GC.LatencyRequest gcLatencyRequest = null;
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/Target.java openjdk-boot/jdk/src/share/classes/sun/rmi/transport/Target.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/Target.java	2013-01-14 03:19:03.633023177 +0000
-+++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/Target.java	2013-09-20 00:33:52.260646123 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/Target.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/Target.java	2013-12-26 22:23:06.718103919 +0000
 @@ -53,10 +53,10 @@
      /** stub for remote object */
      private final Remote stub;
@@ -4717,8 +4802,8 @@
      private final AccessControlContext acc;
      /** context class loader in which target was created */
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/Transport.java openjdk-boot/jdk/src/share/classes/sun/rmi/transport/Transport.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/Transport.java	2013-01-14 03:19:03.637023243 +0000
-+++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/Transport.java	2013-09-20 00:33:52.260646123 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/Transport.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/Transport.java	2013-12-26 22:23:06.718103919 +0000
 @@ -62,7 +62,7 @@
          Log.getLog("sun.rmi.transport.misc", "transport", Transport.logLevel);
  
@@ -4729,8 +4814,8 @@
      /** ObjID for DGCImpl */
      private static final ObjID dgcID = new ObjID(ObjID.DGC_ID);
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/proxy/CGIHandler.java openjdk-boot/jdk/src/share/classes/sun/rmi/transport/proxy/CGIHandler.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/proxy/CGIHandler.java	2013-04-03 01:24:48.710104252 +0100
-+++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/proxy/CGIHandler.java	2013-09-20 00:33:52.260646123 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/proxy/CGIHandler.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/proxy/CGIHandler.java	2013-12-26 22:23:06.718103919 +0000
 @@ -116,7 +116,7 @@
      /* construct table mapping command strings to handlers */
      private static Hashtable<String, CGICommandHandler> commandLookup;
@@ -4741,8 +4826,8 @@
              commandLookup.put(commands[i].getName(), commands[i]);
      }
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/proxy/RMIMasterSocketFactory.java openjdk-boot/jdk/src/share/classes/sun/rmi/transport/proxy/RMIMasterSocketFactory.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/proxy/RMIMasterSocketFactory.java	2013-09-20 00:32:35.747454633 +0100
-+++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/proxy/RMIMasterSocketFactory.java	2013-09-20 00:33:52.260646123 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/proxy/RMIMasterSocketFactory.java	2013-12-26 22:21:55.897021877 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/proxy/RMIMasterSocketFactory.java	2013-12-26 22:23:06.718103919 +0000
 @@ -75,13 +75,13 @@
  
      /** table of hosts successfully connected to and the factory used */
@@ -4769,8 +4854,8 @@
  
          try {
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/tcp/ConnectionMultiplexer.java openjdk-boot/jdk/src/share/classes/sun/rmi/transport/tcp/ConnectionMultiplexer.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/tcp/ConnectionMultiplexer.java	2013-01-14 03:19:03.645023374 +0000
-+++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/tcp/ConnectionMultiplexer.java	2013-09-20 00:33:52.260646123 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/tcp/ConnectionMultiplexer.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/tcp/ConnectionMultiplexer.java	2013-12-26 22:23:06.718103919 +0000
 @@ -85,7 +85,7 @@
      private DataOutputStream dataOut;
  
@@ -4781,8 +4866,8 @@
      /** number of currently open connections */
      private int numConnections = 0;
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/tcp/TCPChannel.java openjdk-boot/jdk/src/share/classes/sun/rmi/transport/tcp/TCPChannel.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/tcp/TCPChannel.java	2013-01-14 03:19:03.645023374 +0000
-+++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/tcp/TCPChannel.java	2013-09-20 00:33:52.260646123 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/tcp/TCPChannel.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/tcp/TCPChannel.java	2013-12-26 22:23:06.718103919 +0000
 @@ -64,7 +64,7 @@
      private final TCPTransport tr;
      /** list of cached connections */
@@ -4802,8 +4887,8 @@
      /** thread ID counter */
      private static int threadNum = 0;
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/tcp/TCPEndpoint.java openjdk-boot/jdk/src/share/classes/sun/rmi/transport/tcp/TCPEndpoint.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/tcp/TCPEndpoint.java	2013-09-20 00:32:35.451450023 +0100
-+++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/tcp/TCPEndpoint.java	2013-09-20 00:33:52.260646123 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/tcp/TCPEndpoint.java	2013-12-26 22:21:55.849021144 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/tcp/TCPEndpoint.java	2013-12-26 22:23:06.718103919 +0000
 @@ -148,7 +148,7 @@
      // TBD: should this be a weak hash table?
      private static final
@@ -4814,8 +4899,8 @@
      /**
       * Create an endpoint for a specified host and port.
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/tcp/TCPTransport.java openjdk-boot/jdk/src/share/classes/sun/rmi/transport/tcp/TCPTransport.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/tcp/TCPTransport.java	2013-01-14 03:19:03.645023374 +0000
-+++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/tcp/TCPTransport.java	2013-09-20 00:33:52.260646123 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/tcp/TCPTransport.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/tcp/TCPTransport.java	2013-12-26 22:23:06.718103919 +0000
 @@ -120,7 +120,7 @@
  
      /** client host for the current thread's connection */
@@ -4835,8 +4920,8 @@
      static final RMISocketFactory defaultSocketFactory =
          RMISocketFactory.getDefaultSocketFactory();
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/acl/AclEntryImpl.java openjdk-boot/jdk/src/share/classes/sun/security/acl/AclEntryImpl.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/security/acl/AclEntryImpl.java	2012-02-08 19:37:43.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/sun/security/acl/AclEntryImpl.java	2013-09-20 00:33:52.260646123 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/sun/security/acl/AclEntryImpl.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/security/acl/AclEntryImpl.java	2013-12-26 22:23:06.718103919 +0000
 @@ -37,7 +37,7 @@
   */
  public class AclEntryImpl implements AclEntry {
@@ -4847,8 +4932,8 @@
  
      /**
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/acl/AclImpl.java openjdk-boot/jdk/src/share/classes/sun/security/acl/AclImpl.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/security/acl/AclImpl.java	2012-02-08 19:37:43.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/sun/security/acl/AclImpl.java	2013-09-20 00:33:52.260646123 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/sun/security/acl/AclImpl.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/security/acl/AclImpl.java	2013-12-26 22:23:06.718103919 +0000
 @@ -41,15 +41,15 @@
      // or principal.
      //
@@ -4889,8 +4974,8 @@
          while (e1.hasMoreElements())
              v.addElement(e1.nextElement());
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/acl/GroupImpl.java openjdk-boot/jdk/src/share/classes/sun/security/acl/GroupImpl.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/security/acl/GroupImpl.java	2012-02-08 19:37:43.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/sun/security/acl/GroupImpl.java	2013-09-20 00:33:52.260646123 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/sun/security/acl/GroupImpl.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/security/acl/GroupImpl.java	2013-12-26 22:23:06.718103919 +0000
 @@ -34,7 +34,7 @@
   * @author      Satish Dharmaraj
   */
@@ -4910,8 +4995,8 @@
          }
      }
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/jca/ProviderList.java openjdk-boot/jdk/src/share/classes/sun/security/jca/ProviderList.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/security/jca/ProviderList.java	2012-02-08 19:37:44.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/sun/security/jca/ProviderList.java	2013-09-20 00:33:52.260646123 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/sun/security/jca/ProviderList.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/security/jca/ProviderList.java	2013-12-26 22:23:06.718103919 +0000
 @@ -96,7 +96,7 @@
          if (providerList.getProvider(p.getName()) != null) {
              return providerList;
@@ -4949,8 +5034,8 @@
              ids.add(new ServiceId(type, alg));
          }
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/jca/Providers.java openjdk-boot/jdk/src/share/classes/sun/security/jca/Providers.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/security/jca/Providers.java	2012-02-08 19:37:44.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/sun/security/jca/Providers.java	2013-09-20 00:33:52.264646185 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/sun/security/jca/Providers.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/security/jca/Providers.java	2013-12-26 22:23:06.718103919 +0000
 @@ -40,7 +40,7 @@
  public class Providers {
  
@@ -4961,8 +5046,8 @@
      // number of threads currently using thread-local provider lists
      // tracked to allow an optimization if == 0
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/jgss/krb5/Krb5Util.java openjdk-boot/jdk/src/share/classes/sun/security/jgss/krb5/Krb5Util.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/security/jgss/krb5/Krb5Util.java	2012-02-08 19:37:44.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/sun/security/jgss/krb5/Krb5Util.java	2013-09-20 00:33:52.264646185 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/sun/security/jgss/krb5/Krb5Util.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/security/jgss/krb5/Krb5Util.java	2013-12-26 22:23:06.718103919 +0000
 @@ -267,7 +267,7 @@
              if (ktabs.isEmpty()) {
                  return kk.toArray(new KerberosKey[kk.size()]);
@@ -4973,8 +5058,8 @@
                      for (KerberosKey k: ktab.getKeys(kp)) {
                          keys.add(k);
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/Config.java openjdk-boot/jdk/src/share/classes/sun/security/krb5/Config.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/Config.java	2012-12-24 13:44:16.954413062 +0000
-+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/Config.java	2013-09-20 00:33:52.264646185 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/Config.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/Config.java	2013-12-26 22:23:06.718103919 +0000
 @@ -576,7 +576,7 @@
                  }
                  })));
@@ -5052,9 +5137,9 @@
              for (int i = 0; i < len; i++) {
                  type = getType(st.nextToken());
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/KdcComm.java openjdk-boot/jdk/src/share/classes/sun/security/krb5/KdcComm.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/KdcComm.java	2012-02-08 19:37:45.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/KdcComm.java	2013-09-20 00:33:52.264646185 +0100
-@@ -462,7 +462,7 @@
+--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/KdcComm.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/KdcComm.java	2013-12-26 22:23:06.718103919 +0000
+@@ -466,7 +466,7 @@
       */
      static class KdcAccessibility {
          // Known bad KDCs
@@ -5063,7 +5148,7 @@
  
          private static synchronized void addBad(String kdc) {
              if (DEBUG) {
-@@ -492,9 +492,9 @@
+@@ -496,9 +496,9 @@
          // Returns a preferred KDC list by putting the bad ones at the end
          private static synchronized String[] list(String kdcList) {
              StringTokenizer st = new StringTokenizer(kdcList);
@@ -5076,8 +5161,8 @@
                      String t = st.nextToken();
                      if (bads.contains(t)) badkdcs.add(t);
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/PrincipalName.java openjdk-boot/jdk/src/share/classes/sun/security/krb5/PrincipalName.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/PrincipalName.java	2013-04-23 21:48:04.152606211 +0100
-+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/PrincipalName.java	2013-09-20 00:33:52.264646185 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/PrincipalName.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/PrincipalName.java	2013-12-26 22:23:06.718103919 +0000
 @@ -238,7 +238,7 @@
              if (subDer.getTag() != DerValue.tag_SequenceOf) {
                  throw new Asn1Exception(Krb5.ASN1_BAD_ID);
@@ -5097,28 +5182,29 @@
          int i = 0;
          int componentStart = 0;
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/Realm.java openjdk-boot/jdk/src/share/classes/sun/security/krb5/Realm.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/Realm.java	2012-02-08 19:37:45.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/Realm.java	2013-09-20 00:33:52.264646185 +0100
-@@ -359,14 +359,14 @@
-         }
- 
-         String tempTarget = null, tempRealm = null;
--        Stack<String> iStack = new Stack<>();
-+        Stack<String> iStack = new Stack<String>();
- 
-         /*
-          * The half-established reversed-path, starting from the final target
-          * (sRealm), each item can be connected to by the next one.
-          * Might contains wrong item, if found, a bad track is performed
-          */
--        Vector<String> tempList = new Vector<>(8, 8);
-+        Vector<String> tempList = new Vector<String>(8, 8);
-         tempList.add(sRealm);
- 
-         int count = 0; // For debug only
+--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/Realm.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/Realm.java	2013-12-26 22:23:27.574422584 +0000
+@@ -368,7 +368,7 @@
+             return null;
+         }
+ 
+-        LinkedList<String> path = new LinkedList<>();
++        LinkedList<String> path = new LinkedList<String>();
+ 
+         String head = sRealm;
+         while (true) {
+@@ -430,7 +430,7 @@
+         // DEVEL.EXAMPLE.COM   3       2
+         // PROD.EXAMPLE.ORG    3       2
+ 
+-        LinkedList<String> path = new LinkedList<>();
++        LinkedList<String> path = new LinkedList<String>();
+ 
+         // Un-common ones for client side
+         for (int i=0; i<=cPos; i++) {
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/Authenticator.java openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/Authenticator.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/Authenticator.java	2012-02-08 19:37:46.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/Authenticator.java	2013-09-20 00:33:52.264646185 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/Authenticator.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/Authenticator.java	2013-12-26 22:23:06.718103919 +0000
 @@ -176,7 +176,7 @@
       * @exception IOException if an I/O error occurs while reading encoded data.
       */
@@ -5129,8 +5215,8 @@
          temp.putInteger(BigInteger.valueOf(authenticator_vno));
          v.addElement(new DerValue(DerValue.createTag(DerValue.TAG_CONTEXT, true, (byte) 0x00), temp.toByteArray()));
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/AuthorizationData.java openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/AuthorizationData.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/AuthorizationData.java	2012-02-08 19:37:46.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/AuthorizationData.java	2013-09-20 00:33:52.264646185 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/AuthorizationData.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/AuthorizationData.java	2013-12-26 22:23:06.718103919 +0000
 @@ -99,7 +99,7 @@
       * @exception IOException if an I/O error occurs while reading encoded data.
       */
@@ -5141,8 +5227,8 @@
              throw new Asn1Exception(Krb5.ASN1_BAD_ID);
          }
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/EncAPRepPart.java openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/EncAPRepPart.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/EncAPRepPart.java	2012-02-08 19:37:46.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/EncAPRepPart.java	2013-09-20 00:33:52.264646185 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/EncAPRepPart.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/EncAPRepPart.java	2013-12-26 22:23:06.718103919 +0000
 @@ -133,7 +133,7 @@
       * @exception IOException if an I/O error occurs while reading encoded data.
       */
@@ -5153,8 +5239,8 @@
          v.addElement(new DerValue(DerValue.createTag(DerValue.TAG_CONTEXT,
                  true, (byte) 0x00), ctime.asn1Encode()));
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/HostAddresses.java openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/HostAddresses.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/HostAddresses.java	2012-02-08 19:37:46.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/HostAddresses.java	2013-09-20 00:33:52.264646185 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/HostAddresses.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/HostAddresses.java	2013-12-26 22:23:06.718103919 +0000
 @@ -179,7 +179,7 @@
      */
      public HostAddresses(DerValue encoding)
@@ -5174,8 +5260,8 @@
          for (int i = 0; i < addresses.length; i++) {
              try {
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/KDCReq.java openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KDCReq.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/KDCReq.java	2012-02-08 19:37:46.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KDCReq.java	2013-09-20 00:33:52.264646185 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/KDCReq.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KDCReq.java	2013-12-26 22:23:06.722103980 +0000
 @@ -150,7 +150,7 @@
              if (subsubDer.getTag() != DerValue.tag_SequenceOf) {
                  throw new Asn1Exception(Krb5.ASN1_BAD_ID);
@@ -5186,8 +5272,8 @@
                  v.addElement(new PAData(subsubDer.getData().getDerValue()));
              }
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/KDCReqBody.java openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KDCReqBody.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/KDCReqBody.java	2012-02-08 19:37:46.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KDCReqBody.java	2013-09-20 00:33:52.264646185 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/KDCReqBody.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KDCReqBody.java	2013-12-26 22:23:06.722103980 +0000
 @@ -158,7 +158,7 @@
              throw new Asn1Exception(Krb5.ASN1_BAD_ID);
          }
@@ -5216,8 +5302,8 @@
          if (msgType == Krb5.KRB_AS_REQ) {
              if (cname != null) {
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/KRBCred.java openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KRBCred.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/KRBCred.java	2012-02-08 19:37:46.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KRBCred.java	2013-09-20 00:33:52.264646185 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/KRBCred.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KRBCred.java	2013-12-26 22:23:06.722103980 +0000
 @@ -134,7 +134,7 @@
              if (subsubDer.getTag() != DerValue.tag_SequenceOf) {
                  throw new Asn1Exception(Krb5.ASN1_BAD_ID);
@@ -5228,8 +5314,8 @@
                  v.addElement(new Ticket(subsubDer.getData().getDerValue()));
              }
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/KRBError.java openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KRBError.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/KRBError.java	2012-09-24 16:16:01.720937196 +0100
-+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KRBError.java	2013-09-20 00:33:52.264646185 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/KRBError.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KRBError.java	2013-12-26 22:23:06.722103980 +0000
 @@ -259,7 +259,7 @@
      private void parsePAData(byte[] data)
              throws IOException, Asn1Exception {
@@ -5240,8 +5326,8 @@
              // read the PA-DATA
              DerValue tmp = derPA.data.getDerValue();
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/KrbCredInfo.java openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KrbCredInfo.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/KrbCredInfo.java	2012-02-08 19:37:46.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KrbCredInfo.java	2013-09-20 00:33:52.264646185 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/KrbCredInfo.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KrbCredInfo.java	2013-12-26 22:23:06.722103980 +0000
 @@ -157,7 +157,7 @@
       * @exception IOException if an I/O error occurs while reading encoded data.
       */
@@ -5252,8 +5338,8 @@
          if (prealm != null)
              v.addElement(new DerValue(DerValue.createTag(DerValue.TAG_CONTEXT, true, (byte)0x01), prealm.asn1Encode()));
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/LastReq.java openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/LastReq.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/LastReq.java	2012-02-08 19:37:46.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/LastReq.java	2013-09-20 00:33:52.264646185 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/LastReq.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/LastReq.java	2013-12-26 22:23:06.722103980 +0000
 @@ -77,7 +77,7 @@
       */
  
@@ -5264,8 +5350,8 @@
              throw new Asn1Exception(Krb5.ASN1_BAD_ID);
          }
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java	2013-08-29 23:46:09.174038595 +0100
-+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java	2013-09-20 00:33:52.264646185 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java	2013-12-26 22:23:06.722103980 +0000
 @@ -542,7 +542,7 @@
  
      private static String exec(String c) {
@@ -5276,8 +5362,8 @@
              v.addElement(st.nextToken());
          }
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/crypto/EType.java openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/crypto/EType.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/crypto/EType.java	2012-02-08 19:37:47.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/crypto/EType.java	2013-09-20 00:33:52.264646185 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/crypto/EType.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/crypto/EType.java	2013-12-26 22:23:06.722103980 +0000
 @@ -257,7 +257,7 @@
                  + configName);
          }
@@ -5288,8 +5374,8 @@
              if (EncryptionKey.findKey(answer[i], keys) != null) {
                  list.add(answer[i]);
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTab.java openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTab.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTab.java	2013-09-20 00:32:36.827471451 +0100
-+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTab.java	2013-09-20 00:33:52.264646185 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTab.java	2013-12-26 22:21:55.897021877 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTab.java	2013-12-26 22:23:06.722103980 +0000
 @@ -67,7 +67,7 @@
  
      // Attention: Currently there is no way to remove a keytab from this map,
@@ -5327,8 +5413,8 @@
          for (int i = entries.size()-1; i >= 0; i--) {
              KeyTabEntry e = entries.get(i);
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/JavaKeyStore.java openjdk-boot/jdk/src/share/classes/sun/security/provider/JavaKeyStore.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/JavaKeyStore.java	2012-02-08 19:37:50.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/sun/security/provider/JavaKeyStore.java	2013-09-20 00:33:52.264646185 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/JavaKeyStore.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/security/provider/JavaKeyStore.java	2013-12-26 22:23:06.722103980 +0000
 @@ -683,7 +683,7 @@
                      // Read the certificate chain
                      int numOfCerts = dis.readInt();
@@ -5339,8 +5425,8 @@
                          for (int j = 0; j < numOfCerts; j++) {
                              if (xVersion == 2) {
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/PolicyFile.java openjdk-boot/jdk/src/share/classes/sun/security/provider/PolicyFile.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/PolicyFile.java	2012-02-08 19:37:50.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/sun/security/provider/PolicyFile.java	2013-09-20 00:33:52.264646185 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/PolicyFile.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/security/provider/PolicyFile.java	2013-12-26 22:23:06.722103980 +0000
 @@ -299,7 +299,7 @@
      private static final int DEFAULT_CACHE_SIZE = 1;
  
@@ -5396,8 +5482,8 @@
                          while (i < certs.length) {
                              signerCerts.add(certs[i]);
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/Sun.java openjdk-boot/jdk/src/share/classes/sun/security/provider/Sun.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/Sun.java	2012-02-08 19:37:50.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/sun/security/provider/Sun.java	2013-09-20 00:33:52.264646185 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/Sun.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/security/provider/Sun.java	2013-12-26 22:23:06.722103980 +0000
 @@ -55,7 +55,7 @@
              SunEntries.putEntries(this);
          } else {
@@ -5408,8 +5494,8 @@
              AccessController.doPrivileged(new PutAllAction(this, map));
          }
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/VerificationProvider.java openjdk-boot/jdk/src/share/classes/sun/security/provider/VerificationProvider.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/VerificationProvider.java	2012-02-08 19:37:50.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/sun/security/provider/VerificationProvider.java	2013-09-20 00:33:52.268646247 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/VerificationProvider.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/security/provider/VerificationProvider.java	2013-12-26 22:23:06.722103980 +0000
 @@ -76,7 +76,7 @@
              SunRsaSignEntries.putEntries(this);
          } else {
@@ -5420,8 +5506,8 @@
              SunRsaSignEntries.putEntries(map);
              AccessController.doPrivileged(new PutAllAction(this, map));
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/X509Factory.java openjdk-boot/jdk/src/share/classes/sun/security/provider/X509Factory.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/X509Factory.java	2012-09-24 16:16:01.732937418 +0100
-+++ openjdk-boot/jdk/src/share/classes/sun/security/provider/X509Factory.java	2013-09-20 00:33:52.268646247 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/X509Factory.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/security/provider/X509Factory.java	2013-12-26 22:23:06.722103980 +0000
 @@ -409,10 +409,10 @@
          parseX509orPKCS7Cert(InputStream is)
          throws CertificateException, IOException
@@ -5467,8 +5553,8 @@
          } catch (ParsingException e) {
              while (data != null) {
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/certpath/DistributionPointFetcher.java openjdk-boot/jdk/src/share/classes/sun/security/provider/certpath/DistributionPointFetcher.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/certpath/DistributionPointFetcher.java	2013-07-08 21:17:48.559644360 +0100
-+++ openjdk-boot/jdk/src/share/classes/sun/security/provider/certpath/DistributionPointFetcher.java	2013-09-20 00:33:52.264646185 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/certpath/DistributionPointFetcher.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/security/provider/certpath/DistributionPointFetcher.java	2013-12-26 22:23:06.722103980 +0000
 @@ -584,7 +584,7 @@
              // Except the performance improvement, another benefit is to break
              // the dead loop while looking for the issuer back and forth
@@ -5479,8 +5565,8 @@
              if (prevKey != null) {
                  // Add the previous certificate as a trust anchor.
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/rsa/RSACore.java openjdk-boot/jdk/src/share/classes/sun/security/rsa/RSACore.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/security/rsa/RSACore.java	2012-02-08 19:37:51.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/sun/security/rsa/RSACore.java	2013-09-20 00:33:52.268646247 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/sun/security/rsa/RSACore.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/security/rsa/RSACore.java	2013-12-26 22:23:06.722103980 +0000
 @@ -219,7 +219,7 @@
      // use a weak hashmap so that cached values are automatically cleared
      // when the modulus is GC'ed
@@ -5491,8 +5577,8 @@
      /**
       * Set of blinding parameters for a given RSA key.
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/rsa/SunRsaSign.java openjdk-boot/jdk/src/share/classes/sun/security/rsa/SunRsaSign.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/security/rsa/SunRsaSign.java	2012-02-08 19:37:51.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/sun/security/rsa/SunRsaSign.java	2013-09-20 00:33:52.268646247 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/sun/security/rsa/SunRsaSign.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/security/rsa/SunRsaSign.java	2013-12-26 22:23:06.722103980 +0000
 @@ -52,7 +52,7 @@
              SunRsaSignEntries.putEntries(this);
          } else {
@@ -5503,8 +5589,8 @@
              AccessController.doPrivileged(new PutAllAction(this, map));
          }
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/CipherSuite.java openjdk-boot/jdk/src/share/classes/sun/security/ssl/CipherSuite.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/CipherSuite.java	2013-04-03 01:24:48.718104377 +0100
-+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/CipherSuite.java	2013-09-20 00:33:52.268646247 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/CipherSuite.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/CipherSuite.java	2013-12-26 22:23:06.722103980 +0000
 @@ -393,7 +393,7 @@
  
          // Map BulkCipher -> Boolean(available)
@@ -5515,8 +5601,8 @@
          // descriptive name including key size, e.g. AES/128
          final String description;
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/ClientHandshaker.java openjdk-boot/jdk/src/share/classes/sun/security/ssl/ClientHandshaker.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/ClientHandshaker.java	2013-04-03 01:24:48.718104377 +0100
-+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/ClientHandshaker.java	2013-09-20 00:33:52.268646247 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/ClientHandshaker.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/ClientHandshaker.java	2013-12-26 22:23:06.722103980 +0000
 @@ -659,7 +659,7 @@
          if (certRequest != null) {
              X509ExtendedKeyManager km = sslContext.getX509KeyManager();
@@ -5545,8 +5631,8 @@
                  if (suite != CipherSuite.C_SCSV) {
                      cipherList.add(suite);
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/HandshakeMessage.java openjdk-boot/jdk/src/share/classes/sun/security/ssl/HandshakeMessage.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/HandshakeMessage.java	2013-04-03 01:24:48.738104691 +0100
-+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/HandshakeMessage.java	2013-09-20 00:33:52.268646247 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/HandshakeMessage.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/HandshakeMessage.java	2013-12-26 22:23:06.722103980 +0000
 @@ -260,7 +260,7 @@
      // add server_name extension
      void addServerNameIndicationExtension(String hostname) {
@@ -5584,8 +5670,8 @@
      private static void digestKey(MessageDigest md, SecretKey key) {
          try {
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/Handshaker.java openjdk-boot/jdk/src/share/classes/sun/security/ssl/Handshaker.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/Handshaker.java	2012-11-30 07:40:06.959169255 +0000
-+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/Handshaker.java	2013-09-20 00:33:52.268646247 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/Handshaker.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/Handshaker.java	2013-12-26 22:23:06.726104042 +0000
 @@ -569,7 +569,7 @@
                  activeProtocols = getActiveProtocols();
              }
@@ -5605,8 +5691,8 @@
                  boolean found = false;
                  for (CipherSuite suite : enabledCipherSuites.collection()) {
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/HelloExtensions.java openjdk-boot/jdk/src/share/classes/sun/security/ssl/HelloExtensions.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/HelloExtensions.java	2012-02-08 19:37:52.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/HelloExtensions.java	2013-09-20 00:33:52.268646247 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/HelloExtensions.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/HelloExtensions.java	2013-12-26 22:23:06.726104042 +0000
 @@ -169,7 +169,7 @@
          return name;
      }
@@ -5626,8 +5712,8 @@
              list.add(toString(format));
          }
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/ProtocolList.java openjdk-boot/jdk/src/share/classes/sun/security/ssl/ProtocolList.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/ProtocolList.java	2012-02-08 19:37:52.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/ProtocolList.java	2013-09-20 00:33:52.268646247 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/ProtocolList.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/ProtocolList.java	2013-12-26 22:23:06.726104042 +0000
 @@ -79,7 +79,7 @@
              throw new IllegalArgumentException("Protocols may not be null");
          }
@@ -5638,8 +5724,8 @@
              ProtocolVersion version = ProtocolVersion.valueOf(names[i]);
              if (versions.contains(version) == false) {
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/SSLAlgorithmConstraints.java openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLAlgorithmConstraints.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/SSLAlgorithmConstraints.java	2012-02-08 19:37:52.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLAlgorithmConstraints.java	2013-09-20 00:33:52.268646247 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/SSLAlgorithmConstraints.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLAlgorithmConstraints.java	2013-12-26 22:23:06.726104042 +0000
 @@ -261,7 +261,7 @@
  
          protected Set<String> decomposes(KeyExchange keyExchange,
@@ -5686,8 +5772,8 @@
                      if(cipherSuite.keyExchange != null) {
                          components.addAll(
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/SSLContextImpl.java openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLContextImpl.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/SSLContextImpl.java	2012-10-24 13:21:45.733637159 +0100
-+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLContextImpl.java	2013-09-20 00:33:52.268646247 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/SSLContextImpl.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLContextImpl.java	2013-12-26 22:23:06.726104042 +0000
 @@ -331,7 +331,7 @@
          Collection<CipherSuite> allowedCipherSuites =
                                      CipherSuite.allowedCipherSuites();
@@ -5716,8 +5802,8 @@
              if ((certs != null) && (certs.length > 0)){
                  Collections.addAll(trustedCerts, certs);
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/SSLSessionImpl.java openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLSessionImpl.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/SSLSessionImpl.java	2012-02-08 19:37:52.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLSessionImpl.java	2013-09-20 00:33:52.268646247 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/SSLSessionImpl.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLSessionImpl.java	2013-12-26 22:23:06.726104042 +0000
 @@ -618,7 +618,7 @@
       * key and the calling security context. This is important since
       * sessions can be shared across different protection domains.
@@ -5737,8 +5823,8 @@
          Object securityCtx = SecureKey.getCurrentSecurityContext();
  
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/SSLSocketImpl.java openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLSocketImpl.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/SSLSocketImpl.java	2013-09-19 18:15:16.356804595 +0100
-+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLSocketImpl.java	2013-09-20 00:33:52.268646247 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/SSLSocketImpl.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLSocketImpl.java	2013-12-26 22:23:06.726104042 +0000
 @@ -2494,7 +2494,7 @@
              entrySet, HandshakeCompletedEvent e) {
  
@@ -5749,8 +5835,8 @@
          }
  
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/SignatureAndHashAlgorithm.java openjdk-boot/jdk/src/share/classes/sun/security/ssl/SignatureAndHashAlgorithm.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/SignatureAndHashAlgorithm.java	2013-04-03 01:24:48.802105694 +0100
-+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SignatureAndHashAlgorithm.java	2013-09-20 00:33:52.268646247 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/SignatureAndHashAlgorithm.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SignatureAndHashAlgorithm.java	2013-12-26 22:23:06.726104042 +0000
 @@ -156,7 +156,7 @@
      static Collection<SignatureAndHashAlgorithm>
              getSupportedAlgorithms(AlgorithmConstraints constraints) {
@@ -5788,8 +5874,8 @@
              for (SignatureAndHashAlgorithm sigAlg : algorithms) {
                  if (sigAlg.hash.value > 0) {
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/SunX509KeyManagerImpl.java openjdk-boot/jdk/src/share/classes/sun/security/ssl/SunX509KeyManagerImpl.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/SunX509KeyManagerImpl.java	2012-02-08 19:37:53.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SunX509KeyManagerImpl.java	2013-09-20 00:33:52.268646247 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/SunX509KeyManagerImpl.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SunX509KeyManagerImpl.java	2013-12-26 22:23:06.726104042 +0000
 @@ -337,7 +337,7 @@
  
          X500Principal[] x500Issuers = (X500Principal[])issuers;
@@ -5809,8 +5895,8 @@
              Principal p = principals[i];
              if (p instanceof X500Principal) {
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java openjdk-boot/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java	2012-02-08 19:37:53.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java	2013-09-20 00:33:52.268646247 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java	2013-12-26 22:23:06.726104042 +0000
 @@ -134,7 +134,7 @@
          FileInputStream fis = null;
          String defaultTrustStoreType;
@@ -5821,8 +5907,8 @@
          KeyStore ks = null;
  
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/X509KeyManagerImpl.java openjdk-boot/jdk/src/share/classes/sun/security/ssl/X509KeyManagerImpl.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/X509KeyManagerImpl.java	2012-02-08 19:37:53.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/X509KeyManagerImpl.java	2013-09-20 00:33:52.268646247 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/X509KeyManagerImpl.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/X509KeyManagerImpl.java	2013-12-26 22:23:06.726104042 +0000
 @@ -307,7 +307,7 @@
                  (keyTypes.length == 0) || (keyTypes[0] == null)) {
              return null;
@@ -5842,8 +5928,8 @@
              return null;
          }
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/tools/JarSigner.java openjdk-boot/jdk/src/share/classes/sun/security/tools/JarSigner.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/security/tools/JarSigner.java	2013-04-03 01:24:48.802105694 +0100
-+++ openjdk-boot/jdk/src/share/classes/sun/security/tools/JarSigner.java	2013-09-20 00:33:52.272646310 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/sun/security/tools/JarSigner.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/security/tools/JarSigner.java	2013-12-26 22:23:06.726104042 +0000
 @@ -123,14 +123,14 @@
      boolean token = false; // token-based keystore
      String jarfile;  // jar files to sign or verify
@@ -5925,8 +6011,8 @@
                  KeyStore caks = KeyTool.getCacertsKeyStore();
                  if (caks != null) {
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/tools/KeyTool.java openjdk-boot/jdk/src/share/classes/sun/security/tools/KeyTool.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/security/tools/KeyTool.java	2013-09-20 00:32:36.827471451 +0100
-+++ openjdk-boot/jdk/src/share/classes/sun/security/tools/KeyTool.java	2013-09-20 00:33:52.272646310 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/sun/security/tools/KeyTool.java	2013-12-26 22:21:55.897021877 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/security/tools/KeyTool.java	2013-12-26 22:23:06.726104042 +0000
 @@ -154,11 +154,11 @@
      private KeyStore caks = null; // "cacerts" keystore
      private char[] srcstorePass = null;
@@ -5997,8 +6083,8 @@
  }
  
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/tools/policytool/PolicyTool.java openjdk-boot/jdk/src/share/classes/sun/security/tools/policytool/PolicyTool.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/security/tools/policytool/PolicyTool.java	2012-02-08 19:37:53.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/sun/security/tools/policytool/PolicyTool.java	2013-09-20 00:33:52.272646310 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/sun/security/tools/policytool/PolicyTool.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/security/tools/policytool/PolicyTool.java	2013-12-26 22:23:06.730104103 +0000
 @@ -643,7 +643,7 @@
          Class<?> pc = Class.forName(type, true,
                  Thread.currentThread().getContextClassLoader());
@@ -6036,8 +6122,8 @@
          super(i, b);
      }
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/util/UntrustedCertificates.java openjdk-boot/jdk/src/share/classes/sun/security/util/UntrustedCertificates.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/security/util/UntrustedCertificates.java	2013-09-20 00:32:37.051474940 +0100
-+++ openjdk-boot/jdk/src/share/classes/sun/security/util/UntrustedCertificates.java	2013-09-20 00:33:52.272646310 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/sun/security/util/UntrustedCertificates.java	2013-12-26 22:21:55.897021877 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/security/util/UntrustedCertificates.java	2013-12-26 22:23:06.730104103 +0000
 @@ -42,7 +42,7 @@
   */
  public final class UntrustedCertificates {
@@ -6048,8 +6134,8 @@
      /**
       * Checks if a certificate is untrusted.
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/x509/X509CRLEntryImpl.java openjdk-boot/jdk/src/share/classes/sun/security/x509/X509CRLEntryImpl.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/security/x509/X509CRLEntryImpl.java	2012-09-24 16:16:01.764938015 +0100
-+++ openjdk-boot/jdk/src/share/classes/sun/security/x509/X509CRLEntryImpl.java	2013-09-20 00:33:52.272646310 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/sun/security/x509/X509CRLEntryImpl.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/security/x509/X509CRLEntryImpl.java	2013-12-26 22:23:06.730104103 +0000
 @@ -352,7 +352,7 @@
          if (extensions == null) {
              return null;
@@ -6078,8 +6164,8 @@
              map.put(ext.getId(), ext);
          }
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/x509/X509CRLImpl.java openjdk-boot/jdk/src/share/classes/sun/security/x509/X509CRLImpl.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/security/x509/X509CRLImpl.java	2012-09-24 16:16:01.764938015 +0100
-+++ openjdk-boot/jdk/src/share/classes/sun/security/x509/X509CRLImpl.java	2013-09-20 00:33:52.272646310 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/sun/security/x509/X509CRLImpl.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/security/x509/X509CRLImpl.java	2013-12-26 22:23:06.730104103 +0000
 @@ -104,8 +104,8 @@
      private X500Principal    issuerPrincipal = null;
      private Date             thisUpdate = null;
@@ -6110,8 +6196,8 @@
              if (!ex.isCritical()) {
                  extSet.add(ex.getExtensionId().toString());
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/x509/X509CertImpl.java openjdk-boot/jdk/src/share/classes/sun/security/x509/X509CertImpl.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/security/x509/X509CertImpl.java	2013-09-19 18:15:14.528776487 +0100
-+++ openjdk-boot/jdk/src/share/classes/sun/security/x509/X509CertImpl.java	2013-09-20 00:33:52.272646310 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/sun/security/x509/X509CertImpl.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/security/x509/X509CertImpl.java	2013-12-26 22:23:06.730104103 +0000
 @@ -1253,7 +1253,7 @@
              if (exts == null) {
                  return null;
@@ -6159,8 +6245,8 @@
                      namesCopy.add(Collections.unmodifiableList(nameEntryCopy));
                  } else {
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/tools/native2ascii/Main.java openjdk-boot/jdk/src/share/classes/sun/tools/native2ascii/Main.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/tools/native2ascii/Main.java	2012-09-24 16:16:01.772938164 +0100
-+++ openjdk-boot/jdk/src/share/classes/sun/tools/native2ascii/Main.java	2013-09-20 00:33:52.272646310 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/sun/tools/native2ascii/Main.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/tools/native2ascii/Main.java	2013-12-26 22:23:06.730104103 +0000
 @@ -95,7 +95,7 @@
       * Run the converter
       */
@@ -6171,8 +6257,8 @@
          boolean createOutputFile = false;
  
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/util/LocaleServiceProviderPool.java openjdk-boot/jdk/src/share/classes/sun/util/LocaleServiceProviderPool.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/util/LocaleServiceProviderPool.java	2012-09-24 16:16:01.772938164 +0100
-+++ openjdk-boot/jdk/src/share/classes/sun/util/LocaleServiceProviderPool.java	2013-09-20 00:33:52.272646310 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/sun/util/LocaleServiceProviderPool.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/util/LocaleServiceProviderPool.java	2013-12-26 22:23:06.730104103 +0000
 @@ -59,7 +59,7 @@
       * set of provider implementations of a particular locale sensitive service.
       */
@@ -6192,8 +6278,8 @@
                          tmpList.add(getLookupLocale(locale));
                      }
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/util/locale/InternalLocaleBuilder.java openjdk-boot/jdk/src/share/classes/sun/util/locale/InternalLocaleBuilder.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/util/locale/InternalLocaleBuilder.java	2012-02-08 19:38:11.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/sun/util/locale/InternalLocaleBuilder.java	2013-09-20 00:33:52.272646310 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/sun/util/locale/InternalLocaleBuilder.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/util/locale/InternalLocaleBuilder.java	2013-12-26 22:23:06.730104103 +0000
 @@ -113,7 +113,7 @@
          }
          // Use case insensitive string to prevent duplication
@@ -6308,8 +6394,8 @@
                      ukeywords.put(key, type);
                  }
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/util/locale/LanguageTag.java openjdk-boot/jdk/src/share/classes/sun/util/locale/LanguageTag.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/util/locale/LanguageTag.java	2012-02-08 19:38:11.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/sun/util/locale/LanguageTag.java	2013-09-20 00:33:52.272646310 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/sun/util/locale/LanguageTag.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/util/locale/LanguageTag.java	2013-12-26 22:23:06.730104103 +0000
 @@ -62,7 +62,7 @@
      // Map contains grandfathered tags and its preferred mappings from
      // http://www.ietf.org/rfc/rfc5646.txt
@@ -6365,8 +6451,8 @@
                      extensions.add(locextKey.toString() + SEP + ext.getValue());
                  }
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/util/locale/LocaleExtensions.java openjdk-boot/jdk/src/share/classes/sun/util/locale/LocaleExtensions.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/util/locale/LocaleExtensions.java	2012-02-08 19:38:11.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/sun/util/locale/LocaleExtensions.java	2013-09-20 00:33:52.272646310 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/sun/util/locale/LocaleExtensions.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/util/locale/LocaleExtensions.java	2013-12-26 22:23:06.730104103 +0000
 @@ -81,7 +81,7 @@
          }
  
@@ -6394,8 +6480,8 @@
                      String key = LocaleUtils.toLowerString(kwd.getKey().value());
                      String type = LocaleUtils.toLowerString(kwd.getValue());
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/util/locale/LocaleObjectCache.java openjdk-boot/jdk/src/share/classes/sun/util/locale/LocaleObjectCache.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/util/locale/LocaleObjectCache.java	2012-09-24 16:16:01.776938240 +0100
-+++ openjdk-boot/jdk/src/share/classes/sun/util/locale/LocaleObjectCache.java	2013-09-20 00:33:52.272646310 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/sun/util/locale/LocaleObjectCache.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/util/locale/LocaleObjectCache.java	2013-12-26 22:23:06.730104103 +0000
 @@ -38,14 +38,14 @@
  
  public abstract class LocaleObjectCache<K, V> {
@@ -6432,8 +6518,8 @@
          return (oldEntry == null) ? null : oldEntry.get();
      }
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/util/logging/PlatformLogger.java openjdk-boot/jdk/src/share/classes/sun/util/logging/PlatformLogger.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/util/logging/PlatformLogger.java	2013-07-08 21:17:48.615645250 +0100
-+++ openjdk-boot/jdk/src/share/classes/sun/util/logging/PlatformLogger.java	2013-09-20 00:33:52.272646310 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/sun/util/logging/PlatformLogger.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/util/logging/PlatformLogger.java	2013-12-26 22:23:06.730104103 +0000
 @@ -187,7 +187,7 @@
  
      // Table of known loggers.  Maps names to PlatformLoggers.
@@ -6453,8 +6539,8 @@
          return log;
      }
 diff -Nru openjdk-boot.orig/jdk/src/share/demo/nio/zipfs/Demo.java openjdk-boot/jdk/src/share/demo/nio/zipfs/Demo.java
---- openjdk-boot.orig/jdk/src/share/demo/nio/zipfs/Demo.java	2012-09-24 16:16:01.864939879 +0100
-+++ openjdk-boot/jdk/src/share/demo/nio/zipfs/Demo.java	2013-09-20 00:33:52.276646372 +0100
+--- openjdk-boot.orig/jdk/src/share/demo/nio/zipfs/Demo.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/demo/nio/zipfs/Demo.java	2013-12-26 22:23:06.730104103 +0000
 @@ -160,7 +160,7 @@
          }
  
@@ -6489,8 +6575,8 @@
          openwrite.add(WRITE);
  
 diff -Nru openjdk-boot.orig/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipCoder.java openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipCoder.java
---- openjdk-boot.orig/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipCoder.java	2012-09-24 16:16:01.864939879 +0100
-+++ openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipCoder.java	2013-09-20 00:33:52.276646372 +0100
+--- openjdk-boot.orig/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipCoder.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipCoder.java	2013-12-26 22:23:06.730104103 +0000
 @@ -142,8 +142,8 @@
          return new ZipCoder(Charset.defaultCharset());
      }
@@ -6503,8 +6589,8 @@
      private CharsetDecoder decoder() {
          CharsetDecoder dec = decTL.get();
 diff -Nru openjdk-boot.orig/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileAttributeView.java openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileAttributeView.java
---- openjdk-boot.orig/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileAttributeView.java	2012-09-24 16:16:01.864939879 +0100
-+++ openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileAttributeView.java	2013-09-20 00:33:52.276646372 +0100
+--- openjdk-boot.orig/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileAttributeView.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileAttributeView.java	2013-12-26 22:23:06.730104103 +0000
 @@ -134,7 +134,7 @@
          throws IOException
      {
@@ -6515,8 +6601,8 @@
              for (AttrID id : AttrID.values()) {
                  try {
 diff -Nru openjdk-boot.orig/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystem.java openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystem.java
---- openjdk-boot.orig/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystem.java	2013-07-08 21:17:48.631645504 +0100
-+++ openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystem.java	2013-09-20 00:33:52.276646372 +0100
+--- openjdk-boot.orig/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystem.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystem.java	2013-12-26 22:23:06.730104103 +0000
 @@ -157,7 +157,7 @@
  
      @Override
@@ -6617,8 +6703,8 @@
              inodes.put(root, root);
              dirs.add(root);
 diff -Nru openjdk-boot.orig/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystemProvider.java openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystemProvider.java
---- openjdk-boot.orig/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystemProvider.java	2012-11-30 07:40:07.015170161 +0000
-+++ openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystemProvider.java	2013-09-20 00:33:52.276646372 +0100
+--- openjdk-boot.orig/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystemProvider.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystemProvider.java	2013-12-26 22:23:06.730104103 +0000
 @@ -62,7 +62,7 @@
  public class ZipFileSystemProvider extends FileSystemProvider {
  
@@ -6629,8 +6715,8 @@
      public ZipFileSystemProvider() {}
  
 diff -Nru openjdk-boot.orig/jdk/src/solaris/classes/java/lang/ProcessEnvironment.java openjdk-boot/jdk/src/solaris/classes/java/lang/ProcessEnvironment.java
---- openjdk-boot.orig/jdk/src/solaris/classes/java/lang/ProcessEnvironment.java	2012-02-08 19:38:55.000000000 +0000
-+++ openjdk-boot/jdk/src/solaris/classes/java/lang/ProcessEnvironment.java	2013-09-20 00:33:52.276646372 +0100
+--- openjdk-boot.orig/jdk/src/solaris/classes/java/lang/ProcessEnvironment.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/solaris/classes/java/lang/ProcessEnvironment.java	2013-12-26 22:23:06.730104103 +0000
 @@ -68,7 +68,7 @@
          // We cache the C environment.  This means that subsequent calls
          // to putenv/setenv from C will not be visible from Java code.
@@ -6641,8 +6727,8 @@
          // so that earlier variables override later ones.
          for (int i = environ.length-1; i > 0; i-=2)
 diff -Nru openjdk-boot.orig/jdk/src/solaris/classes/java/util/prefs/FileSystemPreferences.java openjdk-boot/jdk/src/solaris/classes/java/util/prefs/FileSystemPreferences.java
---- openjdk-boot.orig/jdk/src/solaris/classes/java/util/prefs/FileSystemPreferences.java	2013-09-20 00:32:37.051474940 +0100
-+++ openjdk-boot/jdk/src/solaris/classes/java/util/prefs/FileSystemPreferences.java	2013-09-20 00:33:52.276646372 +0100
+--- openjdk-boot.orig/jdk/src/solaris/classes/java/util/prefs/FileSystemPreferences.java	2013-12-26 22:21:55.901021938 +0000
++++ openjdk-boot/jdk/src/solaris/classes/java/util/prefs/FileSystemPreferences.java	2013-12-26 22:23:06.730104103 +0000
 @@ -354,7 +354,7 @@
       * log against that map.  The resulting map is then written back
       * to the disk.
@@ -6707,8 +6793,8 @@
          }
          if (!changeLog.isEmpty()) {
 diff -Nru openjdk-boot.orig/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java openjdk-boot/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java
---- openjdk-boot.orig/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java	2012-02-08 19:39:01.000000000 +0000
-+++ openjdk-boot/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java	2013-09-20 00:33:52.276646372 +0100
+--- openjdk-boot.orig/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java	2013-12-26 22:23:06.734104163 +0000
 @@ -60,7 +60,7 @@
                                            int maxperkeyword,
                                            int maxkeywords)
@@ -6728,8 +6814,8 @@
          if (domain != null && domain.length() > 0) {
              sl.add(domain);
 diff -Nru openjdk-boot.orig/jdk/src/solaris/classes/sun/net/www/protocol/jar/JarFileFactory.java openjdk-boot/jdk/src/solaris/classes/sun/net/www/protocol/jar/JarFileFactory.java
---- openjdk-boot.orig/jdk/src/solaris/classes/sun/net/www/protocol/jar/JarFileFactory.java	2013-04-03 01:24:49.074109960 +0100
-+++ openjdk-boot/jdk/src/solaris/classes/sun/net/www/protocol/jar/JarFileFactory.java	2013-09-20 00:33:52.276646372 +0100
+--- openjdk-boot.orig/jdk/src/solaris/classes/sun/net/www/protocol/jar/JarFileFactory.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/solaris/classes/sun/net/www/protocol/jar/JarFileFactory.java	2013-12-26 22:23:06.734104163 +0000
 @@ -43,10 +43,10 @@
  class JarFileFactory implements URLJarFile.URLJarFileCloseController {
  
@@ -6744,9 +6830,9 @@
      private static final JarFileFactory instance = new JarFileFactory();
  
 diff -Nru openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/ch/DevPollArrayWrapper.java openjdk-boot/jdk/src/solaris/classes/sun/nio/ch/DevPollArrayWrapper.java
---- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/ch/DevPollArrayWrapper.java	2012-11-30 07:40:07.067171003 +0000
-+++ openjdk-boot/jdk/src/solaris/classes/sun/nio/ch/DevPollArrayWrapper.java	2013-09-20 00:33:52.276646372 +0100
-@@ -130,7 +130,7 @@
+--- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/ch/DevPollArrayWrapper.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/ch/DevPollArrayWrapper.java	2013-12-26 22:23:06.734104163 +0000
+@@ -133,7 +133,7 @@
          pollArrayAddress = pollArray.address();
          wfd = init();
          if (OPEN_MAX > MAX_UPDATE_ARRAY_SIZE)
@@ -6756,9 +6842,9 @@
  
      void initInterrupt(int fd0, int fd1) {
 diff -Nru openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/ch/EPollArrayWrapper.java openjdk-boot/jdk/src/solaris/classes/sun/nio/ch/EPollArrayWrapper.java
---- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/ch/EPollArrayWrapper.java	2013-07-08 21:17:49.207654663 +0100
-+++ openjdk-boot/jdk/src/solaris/classes/sun/nio/ch/EPollArrayWrapper.java	2013-09-20 00:33:52.276646372 +0100
-@@ -134,7 +134,7 @@
+--- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/ch/EPollArrayWrapper.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/ch/EPollArrayWrapper.java	2013-12-26 22:23:06.734104163 +0000
+@@ -136,7 +136,7 @@
  
          // eventHigh needed when using file descriptors > 64k
          if (OPEN_MAX > MAX_UPDATE_ARRAY_SIZE)
@@ -6768,8 +6854,8 @@
  
      void initInterrupt(int fd0, int fd1) {
 diff -Nru openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/ch/EPollSelectorImpl.java openjdk-boot/jdk/src/solaris/classes/sun/nio/ch/EPollSelectorImpl.java
---- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/ch/EPollSelectorImpl.java	2013-07-08 21:17:49.207654663 +0100
-+++ openjdk-boot/jdk/src/solaris/classes/sun/nio/ch/EPollSelectorImpl.java	2013-09-20 00:33:52.276646372 +0100
+--- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/ch/EPollSelectorImpl.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/ch/EPollSelectorImpl.java	2013-12-26 22:23:06.734104163 +0000
 @@ -67,7 +67,7 @@
          fd1 = (int) pipeFds;
          pollWrapper = new EPollArrayWrapper();
@@ -6780,8 +6866,8 @@
  
      protected int doSelect(long timeout) throws IOException {
 diff -Nru openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/ch/SctpNet.java openjdk-boot/jdk/src/solaris/classes/sun/nio/ch/SctpNet.java
---- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/ch/SctpNet.java	2013-07-08 21:17:49.207654663 +0100
-+++ openjdk-boot/jdk/src/solaris/classes/sun/nio/ch/SctpNet.java	2013-09-20 00:33:52.276646372 +0100
+--- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/ch/SctpNet.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/ch/SctpNet.java	2013-12-26 22:23:06.734104163 +0000
 @@ -113,7 +113,7 @@
              SocketAddress[] saa)
      {
@@ -6792,8 +6878,8 @@
               set.add(getRevealedLocalAddress(sa, sm));
           }
 diff -Nru openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/cs/ext/CompoundTextSupport.java openjdk-boot/jdk/src/solaris/classes/sun/nio/cs/ext/CompoundTextSupport.java
---- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/cs/ext/CompoundTextSupport.java	2012-02-08 19:39:02.000000000 +0000
-+++ openjdk-boot/jdk/src/solaris/classes/sun/nio/cs/ext/CompoundTextSupport.java	2013-09-20 00:33:52.276646372 +0100
+--- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/cs/ext/CompoundTextSupport.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/cs/ext/CompoundTextSupport.java	2013-12-26 22:23:06.734104163 +0000
 @@ -153,12 +153,12 @@
  
      static {
@@ -6812,8 +6898,8 @@
          if (!(isEncodingSupported("US-ASCII") &&
                isEncodingSupported("ISO-8859-1")))
 diff -Nru openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/LinuxFileSystem.java openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/LinuxFileSystem.java
---- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/LinuxFileSystem.java	2012-09-24 19:25:57.082008561 +0100
-+++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/LinuxFileSystem.java	2013-09-20 00:33:52.276646372 +0100
+--- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/LinuxFileSystem.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/LinuxFileSystem.java	2013-12-26 22:23:06.734104163 +0000
 @@ -53,7 +53,7 @@
          static final Set<String> supportedFileAttributeViews =
              supportedFileAttributeViews();
@@ -6833,8 +6919,8 @@
              long fp = setmntent(fstab.getBytes(), "r".getBytes());
              try {
 diff -Nru openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/LinuxUserDefinedFileAttributeView.java openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/LinuxUserDefinedFileAttributeView.java
---- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/LinuxUserDefinedFileAttributeView.java	2012-09-24 16:16:01.988942191 +0100
-+++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/LinuxUserDefinedFileAttributeView.java	2013-09-20 00:33:52.276646372 +0100
+--- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/LinuxUserDefinedFileAttributeView.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/LinuxUserDefinedFileAttributeView.java	2013-12-26 22:23:06.734104163 +0000
 @@ -63,7 +63,7 @@
  
      // Parses buffer as array of NULL-terminated C strings.
@@ -6845,8 +6931,8 @@
          int pos = 0;
          while (pos < size) {
 diff -Nru openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/SolarisAclFileAttributeView.java openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/SolarisAclFileAttributeView.java
---- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/SolarisAclFileAttributeView.java	2013-04-03 01:24:49.102110399 +0100
-+++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/SolarisAclFileAttributeView.java	2013-09-20 00:33:52.276646372 +0100
+--- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/SolarisAclFileAttributeView.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/SolarisAclFileAttributeView.java	2013-12-26 22:23:06.734104163 +0000
 @@ -198,7 +198,7 @@
       * Decode the buffer, returning an ACL
       */
@@ -6857,8 +6943,8 @@
              long offset = address + i*SIZEOF_ACE_T;
  
 diff -Nru openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/SolarisFileSystem.java openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/SolarisFileSystem.java
---- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/SolarisFileSystem.java	2012-09-24 19:25:57.082008561 +0100
-+++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/SolarisFileSystem.java	2013-09-20 00:33:52.276646372 +0100
+--- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/SolarisFileSystem.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/SolarisFileSystem.java	2013-12-26 22:23:06.734104163 +0000
 @@ -76,7 +76,7 @@
          static final Set<String> supportedFileAttributeViews =
              supportedFileAttributeViews();
@@ -6878,8 +6964,8 @@
              UnixPath mnttab = new UnixPath(this, "/etc/mnttab");
              long fp = fopen(mnttab, "r");
 diff -Nru openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java
---- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java	2012-12-24 13:44:17.018414142 +0000
-+++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java	2013-09-20 00:33:52.276646372 +0100
+--- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java	2013-12-26 22:23:06.734104163 +0000
 @@ -83,7 +83,7 @@
                  }
  
@@ -6890,8 +6976,8 @@
                      byte[] name;
                      while ((name = readdir(dp)) != null) {
 diff -Nru openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/UnixFileAttributes.java openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/UnixFileAttributes.java
---- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/UnixFileAttributes.java	2012-02-08 19:39:03.000000000 +0000
-+++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/UnixFileAttributes.java	2013-09-20 00:33:52.276646372 +0100
+--- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/UnixFileAttributes.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/UnixFileAttributes.java	2013-12-26 22:23:06.734104163 +0000
 @@ -194,7 +194,7 @@
      @Override
      public Set<PosixFilePermission> permissions() {
@@ -6902,8 +6988,8 @@
          if ((bits & UnixConstants.S_IRUSR) > 0)
              perms.add(PosixFilePermission.OWNER_READ);
 diff -Nru openjdk-boot.orig/jdk/src/windows/classes/java/lang/ProcessEnvironment.java openjdk-boot/jdk/src/windows/classes/java/lang/ProcessEnvironment.java
---- openjdk-boot.orig/jdk/src/windows/classes/java/lang/ProcessEnvironment.java	2012-02-08 19:39:17.000000000 +0000
-+++ openjdk-boot/jdk/src/windows/classes/java/lang/ProcessEnvironment.java	2013-09-20 00:33:52.276646372 +0100
+--- openjdk-boot.orig/jdk/src/windows/classes/java/lang/ProcessEnvironment.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/windows/classes/java/lang/ProcessEnvironment.java	2013-12-26 22:23:06.734104163 +0000
 @@ -250,7 +250,8 @@
                                     envblock.substring(eql+1,end));
          }
@@ -6925,8 +7011,8 @@
  
          StringBuilder sb = new StringBuilder(size()*30);
 diff -Nru openjdk-boot.orig/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java openjdk-boot/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java
---- openjdk-boot.orig/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java	2012-02-08 19:39:20.000000000 +0000
-+++ openjdk-boot/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java	2013-09-20 00:33:52.276646372 +0100
+--- openjdk-boot.orig/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java	2013-12-26 22:23:06.734104163 +0000
 @@ -63,7 +63,7 @@
      // Parse string that consists of token delimited by space or commas
      // and return LinkedHashMap
@@ -6937,8 +7023,8 @@
          // comma and space are valid delimites
          StringTokenizer st = new StringTokenizer(str, ", ");
 diff -Nru openjdk-boot.orig/jdk/src/windows/classes/sun/nio/fs/WindowsFileSystem.java openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsFileSystem.java
---- openjdk-boot.orig/jdk/src/windows/classes/sun/nio/fs/WindowsFileSystem.java	2012-02-08 19:39:21.000000000 +0000
-+++ openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsFileSystem.java	2013-09-20 00:33:52.276646372 +0100
+--- openjdk-boot.orig/jdk/src/windows/classes/sun/nio/fs/WindowsFileSystem.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsFileSystem.java	2013-12-26 22:23:06.734104163 +0000
 @@ -128,7 +128,7 @@
          }
  
@@ -6949,8 +7035,8 @@
          for (int i = 0; i <= 25; i++) {  // 0->A, 1->B, 2->C...
              if ((drives & (1 << i)) != 0) {
 diff -Nru openjdk-boot.orig/jdk/src/windows/classes/sun/nio/fs/WindowsPath.java openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsPath.java
---- openjdk-boot.orig/jdk/src/windows/classes/sun/nio/fs/WindowsPath.java	2013-07-08 21:17:49.379657398 +0100
-+++ openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsPath.java	2013-09-20 00:33:52.276646372 +0100
+--- openjdk-boot.orig/jdk/src/windows/classes/sun/nio/fs/WindowsPath.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsPath.java	2013-12-26 22:23:06.734104163 +0000
 @@ -575,7 +575,7 @@
      // generate offset array
      private void initOffsets() {
@@ -6961,8 +7047,8 @@
                  // empty path considered to have one name element
                  list.add(0);
 diff -Nru openjdk-boot.orig/jdk/src/windows/classes/sun/nio/fs/WindowsSecurityDescriptor.java openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsSecurityDescriptor.java
---- openjdk-boot.orig/jdk/src/windows/classes/sun/nio/fs/WindowsSecurityDescriptor.java	2012-02-08 19:39:21.000000000 +0000
-+++ openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsSecurityDescriptor.java	2013-09-20 00:33:52.276646372 +0100
+--- openjdk-boot.orig/jdk/src/windows/classes/sun/nio/fs/WindowsSecurityDescriptor.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsSecurityDescriptor.java	2013-12-26 22:23:06.734104163 +0000
 @@ -378,7 +378,7 @@
              AclInformation aclInfo = GetAclInformation(aclAddress);
              aceCount = aclInfo.aceCount();
@@ -6973,8 +7059,8 @@
          // decode each of the ACEs to AclEntry objects
          for (int i=0; i<aceCount; i++) {
 diff -Nru openjdk-boot.orig/jdk/src/windows/classes/sun/nio/fs/WindowsUserDefinedFileAttributeView.java openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsUserDefinedFileAttributeView.java
---- openjdk-boot.orig/jdk/src/windows/classes/sun/nio/fs/WindowsUserDefinedFileAttributeView.java	2012-02-08 19:39:21.000000000 +0000
-+++ openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsUserDefinedFileAttributeView.java	2013-09-20 00:33:52.280646433 +0100
+--- openjdk-boot.orig/jdk/src/windows/classes/sun/nio/fs/WindowsUserDefinedFileAttributeView.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsUserDefinedFileAttributeView.java	2013-12-26 22:23:06.734104163 +0000
 @@ -65,7 +65,7 @@
  
      // enumerates the file streams using FindFirstStream/FindNextStream APIs.
@@ -7021,8 +7107,8 @@
                  opts.add(WindowsChannelFactory.OPEN_REPARSE_POINT);
              opts.add(CREATE);
 diff -Nru openjdk-boot.orig/jdk/test/java/io/Serializable/NPEProvoker/NPEProvoker.java openjdk-boot/jdk/test/java/io/Serializable/NPEProvoker/NPEProvoker.java
---- openjdk-boot.orig/jdk/test/java/io/Serializable/NPEProvoker/NPEProvoker.java	2012-02-08 19:40:12.000000000 +0000
-+++ openjdk-boot/jdk/test/java/io/Serializable/NPEProvoker/NPEProvoker.java	2013-09-20 00:33:52.280646433 +0100
+--- openjdk-boot.orig/jdk/test/java/io/Serializable/NPEProvoker/NPEProvoker.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/test/java/io/Serializable/NPEProvoker/NPEProvoker.java	2013-12-26 22:23:06.734104163 +0000
 @@ -56,7 +56,7 @@
      public static void main(String[] args) {
          System.err.println("\n Regression test for bug 6541870\n");
@@ -7033,8 +7119,8 @@
              ByteArrayOutputStream baos = new ByteArrayOutputStream();
              ObjectOutputStream oos = new ObjectOutputStream(baos);
 diff -Nru openjdk-boot.orig/jdk/test/java/lang/instrument/ilib/Inject.java openjdk-boot/jdk/test/java/lang/instrument/ilib/Inject.java
---- openjdk-boot.orig/jdk/test/java/lang/instrument/ilib/Inject.java	2012-02-08 19:40:28.000000000 +0000
-+++ openjdk-boot/jdk/test/java/lang/instrument/ilib/Inject.java	2013-09-20 00:33:52.280646433 +0100
+--- openjdk-boot.orig/jdk/test/java/lang/instrument/ilib/Inject.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/test/java/lang/instrument/ilib/Inject.java	2013-12-26 22:23:06.734104163 +0000
 @@ -107,7 +107,7 @@
      class IndexedInjector implements TrackerInjector {
          int counter = 0;
@@ -7045,8 +7131,8 @@
          public int stackSize(int currentSize) {
              return currentSize + 1;
 diff -Nru openjdk-boot.orig/jdk/test/java/lang/instrument/ilib/InjectBytecodes.java openjdk-boot/jdk/test/java/lang/instrument/ilib/InjectBytecodes.java
---- openjdk-boot.orig/jdk/test/java/lang/instrument/ilib/InjectBytecodes.java	2012-02-08 19:40:28.000000000 +0000
-+++ openjdk-boot/jdk/test/java/lang/instrument/ilib/InjectBytecodes.java	2013-09-20 00:33:52.280646433 +0100
+--- openjdk-boot.orig/jdk/test/java/lang/instrument/ilib/InjectBytecodes.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/test/java/lang/instrument/ilib/InjectBytecodes.java	2013-12-26 22:23:06.734104163 +0000
 @@ -50,7 +50,7 @@
      private final Injector[] after  = new Injector[256];
      private final String className;
@@ -7057,8 +7143,8 @@
      private int pos;
      private int newPos;
 diff -Nru openjdk-boot.orig/jdk/test/java/lang/reflect/Generics/TestPlainArrayNotGeneric.java openjdk-boot/jdk/test/java/lang/reflect/Generics/TestPlainArrayNotGeneric.java
---- openjdk-boot.orig/jdk/test/java/lang/reflect/Generics/TestPlainArrayNotGeneric.java	2012-02-08 19:40:31.000000000 +0000
-+++ openjdk-boot/jdk/test/java/lang/reflect/Generics/TestPlainArrayNotGeneric.java	2013-09-20 00:33:52.280646433 +0100
+--- openjdk-boot.orig/jdk/test/java/lang/reflect/Generics/TestPlainArrayNotGeneric.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/test/java/lang/reflect/Generics/TestPlainArrayNotGeneric.java	2013-12-26 22:23:06.734104163 +0000
 @@ -103,7 +103,7 @@
          }
      }
@@ -7069,8 +7155,8 @@
      private static void check(Type t, String what) {
          if (t == null || !checking.add(t))
 diff -Nru openjdk-boot.orig/jdk/test/java/util/Random/DistinctSeeds.java openjdk-boot/jdk/test/java/util/Random/DistinctSeeds.java
---- openjdk-boot.orig/jdk/test/java/util/Random/DistinctSeeds.java	2012-02-08 19:41:11.000000000 +0000
-+++ openjdk-boot/jdk/test/java/util/Random/DistinctSeeds.java	2013-09-20 00:33:52.280646433 +0100
+--- openjdk-boot.orig/jdk/test/java/util/Random/DistinctSeeds.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/test/java/util/Random/DistinctSeeds.java	2013-12-26 22:23:06.734104163 +0000
 @@ -59,7 +59,7 @@
              }
          }
@@ -7081,8 +7167,8 @@
          for (int i = 0; i < threadCount; i++) {
              RandomCollector r = new RandomCollector();
 diff -Nru openjdk-boot.orig/jdk/test/java/util/logging/ClassLoaderLeakTest.java openjdk-boot/jdk/test/java/util/logging/ClassLoaderLeakTest.java
---- openjdk-boot.orig/jdk/test/java/util/logging/ClassLoaderLeakTest.java	2012-02-08 19:41:17.000000000 +0000
-+++ openjdk-boot/jdk/test/java/util/logging/ClassLoaderLeakTest.java	2013-09-20 00:33:52.280646433 +0100
+--- openjdk-boot.orig/jdk/test/java/util/logging/ClassLoaderLeakTest.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/test/java/util/logging/ClassLoaderLeakTest.java	2013-12-26 22:23:06.734104163 +0000
 @@ -89,7 +89,7 @@
  
           MyClassLoader appClassLoader = new MyClassLoader(urls, "test0");

--- a/patches/boot/ecj-multicatch.patch	Fri Dec 20 11:29:32 2013 +0100
+++ b/patches/boot/ecj-multicatch.patch	Thu Dec 26 23:17:45 2013 +0000
@@ -466,3 +466,18 @@
                  ei = new EncodingInfo(null,null);
              }
          }
+diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/nio/charset/Charset.java openjdk-boot/jdk/src/share/classes/java/nio/charset/Charset.java
+--- openjdk-boot.orig/jdk/src/share/classes/java/nio/charset/Charset.java	2013-12-26 22:36:18.267285222 +0000
++++ openjdk-boot/jdk/src/share/classes/java/nio/charset/Charset.java	2013-12-26 22:36:43.439705661 +0000
+@@ -440,8 +440,9 @@
+                                 } catch (ClassNotFoundException x) {
+                                     // Extended charsets not available
+                                     // (charsets.jar not present)
+-                                } catch (InstantiationException |
+-                                         IllegalAccessException x) {
++                                } catch (InstantiationException x) {
++                                  throw new Error(x);
++                                } catch (IllegalAccessException x) {
+                                   throw new Error(x);
+                                 }
+                                 return null;

--- a/patches/boot/ecj-stringswitch.patch	Fri Dec 20 11:29:32 2013 +0100
+++ b/patches/boot/ecj-stringswitch.patch	Thu Dec 26 23:17:45 2013 +0000
@@ -1,6 +1,6 @@
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java	2013-07-01 15:22:10.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java	2013-07-02 03:38:10.090272900 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java	2013-12-26 22:14:29.670206162 +0000
 @@ -350,19 +350,16 @@
              if (attrCommands != null) {
                  Object lkey = Attribute.keyForLookup(ctype, name);
@@ -32,8 +32,8 @@
              // Find canonical instance of the requested attribute.
              Attribute a = Attribute.lookup(Package.attrDefs, ctype, name);
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java	2013-07-01 15:22:10.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java	2013-07-02 03:38:10.106273156 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java	2013-12-26 22:14:29.670206162 +0000
 @@ -73,16 +73,14 @@
          {
              // Non-standard, undocumented "--unpack" switch enables unpack mode.
@@ -91,8 +91,8 @@
  
          if (logFile != null && !logFile.equals("")) {
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java	2013-07-01 15:22:10.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java	2013-07-02 03:38:10.106273156 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java	2013-12-26 22:14:29.670206162 +0000
 @@ -1116,30 +1116,25 @@
          // what is one of { Debug, Compile, Constant, Exceptions, InnerClasses }
          if (verbose > 0)
@@ -144,8 +144,8 @@
      }
  
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/security/ntlm/NTLM.java openjdk-boot/jdk/src/share/classes/com/sun/security/ntlm/NTLM.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/ntlm/NTLM.java	2013-07-01 15:22:10.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/security/ntlm/NTLM.java	2013-07-02 03:38:10.106273156 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/ntlm/NTLM.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/com/sun/security/ntlm/NTLM.java	2013-12-26 22:14:29.670206162 +0000
 @@ -64,17 +64,23 @@
  
      protected NTLM(String version) throws NTLMException {
@@ -182,8 +182,8 @@
              fac = SecretKeyFactory.getInstance ("DES");
              cipher = Cipher.getInstance ("DES/ECB/NoPadding");
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java
---- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java	2013-07-01 15:22:10.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java	2013-07-02 03:42:53.718781065 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java	2013-12-26 22:19:11.986517834 +0000
 @@ -328,12 +328,11 @@
                                       Object[] appendixResult) {
          try {
@@ -202,7 +202,7 @@
              }
          } catch (Throwable ex) {
              if (ex instanceof LinkageError)
-@@ -403,122 +402,118 @@
+@@ -403,124 +402,120 @@
      // this method is also called by test/sun/reflect/CallerSensitiveFinder
      // to validate the hand-maintained list
      private static boolean isCallerSensitiveMethod(Class<?> defc, String method) {
@@ -261,6 +261,7 @@
 -        case "getDeclaredField":
 -        case "getDeclaredMethod":
 -        case "getDeclaredConstructor":
+-        case "getDeclaringClass":
 -        case "getEnclosingClass":
 -        case "getEnclosingMethod":
 -        case "getEnclosingConstructor":
@@ -296,6 +297,7 @@
 -            return defc == java.lang.ClassLoader.class;
 -        case "registerAsParallelCapable":
 -            return defc == java.lang.ClassLoader.class;
+-        case "getInvocationHandler":
 -        case "getProxyClass":
 -        case "newProxyInstance":
 -            return defc == java.lang.reflect.Proxy.class;
@@ -363,6 +365,7 @@
 +		   "getDeclaredField".equals(method) ||
 +		   "getDeclaredMethod".equals(method) ||
 +		   "getDeclaredConstructor".equals(method) ||
++		   "getDeclaringClass".equals(method) ||
 +		   "getEnclosingClass".equals(method) ||
 +		   "getEnclosingMethod".equals(method) ||
 +		   "getEnclosingConstructor".equals(method)) {
@@ -396,6 +399,7 @@
 +        } else if ("registerAsParallelCapable".equals(method)) {
 +             return defc == java.lang.ClassLoader.class;
 +        } else if ("getProxyClass".equals(method) ||
++                   "getInvocationHandler".equals(method) ||
 +		   "newProxyInstance".equals(method)) {
 +             return defc == java.lang.reflect.Proxy.class;
 +        } else if ("asInterfaceInstance".equals(method)) {
@@ -430,8 +434,8 @@
          }
          return false;
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandleProxies.java openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleProxies.java
---- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandleProxies.java	2013-07-01 15:22:10.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleProxies.java	2013-07-02 03:38:10.106273156 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandleProxies.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleProxies.java	2013-12-26 22:14:29.670206162 +0000
 @@ -269,14 +269,16 @@
  
      private static
@@ -473,8 +477,8 @@
          }
          return null;
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/launcher/LauncherHelper.java openjdk-boot/jdk/src/share/classes/sun/launcher/LauncherHelper.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/launcher/LauncherHelper.java	2013-07-01 15:22:10.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/sun/launcher/LauncherHelper.java	2013-07-02 03:38:10.106273156 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/sun/launcher/LauncherHelper.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/launcher/LauncherHelper.java	2013-12-26 22:14:29.670206162 +0000
 @@ -119,24 +119,20 @@
          String optStr = (opts.length > 1 && opts[1] != null)
                  ? opts[1].trim()
@@ -512,8 +516,8 @@
  
      /*
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/util/DisabledAlgorithmConstraints.java openjdk-boot/jdk/src/share/classes/sun/security/util/DisabledAlgorithmConstraints.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/security/util/DisabledAlgorithmConstraints.java	2013-07-01 15:22:10.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/sun/security/util/DisabledAlgorithmConstraints.java	2013-07-02 03:38:10.106273156 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/sun/security/util/DisabledAlgorithmConstraints.java	2013-12-26 19:50:56.000000000 +0000
++++ openjdk-boot/jdk/src/share/classes/sun/security/util/DisabledAlgorithmConstraints.java	2013-12-26 22:14:29.670206162 +0000
 @@ -378,19 +378,23 @@
              GE;         // ">="