changeset 41200:064c4150b0ee

Merge
author amurillo
date Fri, 16 Sep 2016 13:15:02 -0700
parents cca6aec2bd7b 9fb8c8e7528e
children 83e7744df313 f2c5e3cc1848 95fce77ec1b6
files jdk/src/java.base/share/classes/sun/text/resources/BreakIteratorRulesProvider.java jdk/src/jdk.localedata/share/classes/sun/text/resources/thai_dict jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/libnspr4.dll jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/libnspr4.lib jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/libplc4.dll jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/libplc4.lib jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/libplds4.dll jdk/test/sun/security/pkcs11/nss/lib/windows-amd64/libplds4.lib jdk/test/sun/security/pkcs11/nss/lib/windows-i586/libnspr4.dll jdk/test/sun/security/pkcs11/nss/lib/windows-i586/libnspr4.lib jdk/test/sun/security/pkcs11/nss/lib/windows-i586/libplc4.dll jdk/test/sun/security/pkcs11/nss/lib/windows-i586/libplc4.lib jdk/test/sun/security/pkcs11/nss/lib/windows-i586/libplds4.dll jdk/test/sun/security/pkcs11/nss/lib/windows-i586/libplds4.lib jdk/test/sun/security/pkcs11/nss/src/nss-3.16_nspr-4.10_src.tar.gz jdk/test/sun/security/pkcs11/nss/src/nss-3.16_nspr-4.10_src.tar.gz.sha256
diffstat 840 files changed, 4199 insertions(+), 2286 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Thu Sep 15 16:56:11 2016 -0400
+++ b/.hgtags	Fri Sep 16 13:15:02 2016 -0700
@@ -377,3 +377,4 @@
 2e83d21d78cd9c1d52e6cd2599e9c8aa36ea1f52 jdk-9+132
 e17429a7e843c4a4ed3651458d0f950970edcbcc jdk-9+133
 a71210c0d9800eb6925b61ecd6198abd554f90ee jdk-9+134
+e384420383a5b79fa0012ebcb25d8f83cff7f777 jdk-9+135
--- a/.hgtags-top-repo	Thu Sep 15 16:56:11 2016 -0400
+++ b/.hgtags-top-repo	Fri Sep 16 13:15:02 2016 -0700
@@ -377,3 +377,4 @@
 a24702d4d5ab0015a5c553ed57f66fce7d85155e jdk-9+132
 be1218f792a450dfb5d4b1f82616b9d95a6a732e jdk-9+133
 065724348690eda41fc69112278d8da6dcde548c jdk-9+134
+82b94cb5f342319d2cda77f9fa59703ad7fde576 jdk-9+135
--- a/corba/.hgtags	Thu Sep 15 16:56:11 2016 -0400
+++ b/corba/.hgtags	Fri Sep 16 13:15:02 2016 -0700
@@ -377,3 +377,4 @@
 1ab4b9399c4cba584f66c1c088188f2f565fbf9c jdk-9+132
 2021bfedf1c478a4808a7711a6090682a12f4c0e jdk-9+133
 1a497f5ca0cfd88115cc7daa8af8a62b8741caf2 jdk-9+134
+094d0db606db976045f594dba47d4593b715cc81 jdk-9+135
--- a/hotspot/.hgtags	Thu Sep 15 16:56:11 2016 -0400
+++ b/hotspot/.hgtags	Fri Sep 16 13:15:02 2016 -0700
@@ -537,3 +537,4 @@
 713951c08aa26813375175c2ab6cc99ff2a56903 jdk-9+132
 a25e0fb6033245ab075136e744d362ce765464cd jdk-9+133
 b8b694c6b4d2ab0939aed7adaf0eec1ac321a085 jdk-9+134
+3b1c4562953db47e36b237a500f368d5c9746d47 jdk-9+135
--- a/jaxp/.hgtags	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/.hgtags	Fri Sep 16 13:15:02 2016 -0700
@@ -377,3 +377,4 @@
 907445d85e680ea410fe2c83c0ec64b5508e4f3e jdk-9+132
 9490ba2e5e41685c858a0ca2a6ec87611eb011c6 jdk-9+133
 1c6c21d87aa459d82425e1fddc9ce8647aebde34 jdk-9+134
+f695240370c77a25fed88225a392e7d530cb4d78 jdk-9+135
--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/TransletOutput.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/TransletOutput.java	Fri Sep 16 13:15:02 2016 -0700
@@ -1,13 +1,14 @@
 /*
- * reserved comment block
- * DO NOT REMOVE OR ALTER!
+ * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
  */
+
 /*
- * Copyright 2001-2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
  *
  *     http://www.apache.org/licenses/LICENSE-2.0
  *
@@ -17,9 +18,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-/*
- * $Id: TransletOutput.java,v 1.2.4.1 2005/09/05 09:19:44 pvedula Exp $
- */
 
 package com.sun.org.apache.xalan.internal.xsltc.compiler;
 
@@ -35,6 +33,7 @@
 import com.sun.org.apache.xalan.internal.xsltc.compiler.util.Type;
 import com.sun.org.apache.xalan.internal.xsltc.compiler.util.TypeCheckError;
 import com.sun.org.apache.xalan.internal.xsltc.compiler.util.Util;
+import jdk.xml.internal.JdkXmlFeatures;
 
 /**
  * @author Morten Jorgensen
@@ -103,8 +102,10 @@
         final InstructionList il = methodGen.getInstructionList();
         final boolean isSecureProcessing = classGen.getParser().getXSLTC()
                                            .isSecureProcessing();
+        final boolean isExtensionFunctionEnabled = classGen.getParser().getXSLTC()
+                .getFeature(JdkXmlFeatures.XmlFeature.ENABLE_EXTENSION_FUNCTION);
 
-        if (isSecureProcessing) {
+        if (isSecureProcessing && !isExtensionFunctionEnabled) {
             int index = cpg.addMethodref(BASIS_LIBRARY_CLASS,
                                          "unallowed_extension_elementF",
                                          "(Ljava/lang/String;)V");
--- a/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/AbstractTranslet.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/AbstractTranslet.java	Fri Sep 16 13:15:02 2016 -0700
@@ -111,6 +111,9 @@
 
     private boolean _useServicesMechanism;
 
+    // The OutputStream for redirect function
+    private FileOutputStream output = null;
+
     /**
      * protocols allowed for external references set by the stylesheet processing instruction, Document() function, Import and Include element.
      */
@@ -567,9 +570,10 @@
                dir.mkdirs();
             }
 
+            output = new FileOutputStream(filename, append);
             factory.setEncoding(_encoding);
             factory.setOutputMethod(_method);
-            factory.setOutputStream(new BufferedOutputStream(new FileOutputStream(filename, append)));
+            factory.setOutputStream(new BufferedOutputStream(output));
             factory.setOutputType(TransletOutputHandlerFactory.STREAM);
 
             final SerializationHandler handler
@@ -594,6 +598,9 @@
         try {
             handler.endDocument();
             handler.close();
+            if (output != null) {
+                output.close();
+            }
         }
         catch (Exception e) {
             // what can you do?
--- a/jaxp/src/java.xml/share/classes/javax/xml/datatype/XMLGregorianCalendar.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/src/java.xml/share/classes/javax/xml/datatype/XMLGregorianCalendar.java	Fri Sep 16 13:15:02 2016 -0700
@@ -1072,4 +1072,3 @@
     @Override
     public abstract Object clone();
 }
-
--- a/jaxp/src/java.xml/share/classes/module-info.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/src/java.xml/share/classes/module-info.java	Fri Sep 16 13:15:02 2016 -0700
@@ -92,4 +92,3 @@
     uses javax.xml.xpath.XPathFactory;
     uses org.xml.sax.XMLReader;
 }
-
--- a/jaxp/src/jdk.xml.dom/share/classes/module-info.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/src/jdk.xml.dom/share/classes/module-info.java	Fri Sep 16 13:15:02 2016 -0700
@@ -30,4 +30,3 @@
     exports org.w3c.dom.stylesheets;
     exports org.w3c.dom.xpath;
 }
-
--- a/jaxp/test/javax/xml/jaxp/functional/javax/xml/datatype/ptests/DurationTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/javax/xml/datatype/ptests/DurationTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -587,4 +587,3 @@
     private final BigInteger one = BigInteger.ONE;
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/functional/javax/xml/datatype/ptests/FactoryNewInstanceTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/javax/xml/datatype/ptests/FactoryNewInstanceTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -77,4 +77,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/functional/javax/xml/datatype/ptests/XMLGregorianCalendarTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/javax/xml/datatype/ptests/XMLGregorianCalendarTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -358,4 +358,3 @@
     private final int undef = DatatypeConstants.FIELD_UNDEFINED;
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/ptests/DBFNamespaceTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/ptests/DBFNamespaceTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -105,5 +105,3 @@
         }
     }
 }
-
-
--- a/jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/ptests/DocumentBuilderFactoryTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/ptests/DocumentBuilderFactoryTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -531,5 +531,3 @@
         assertTrue(compareWithGold(goldFile, outputFile));
     }
 }
-
-
--- a/jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/ptests/DocumentBuilderImpl01.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/ptests/DocumentBuilderImpl01.java	Fri Sep 16 13:15:02 2016 -0700
@@ -157,5 +157,3 @@
             return null;
     }
 }
-
-
--- a/jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/ptests/FactoryConfErrorTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/ptests/FactoryConfErrorTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -86,5 +86,3 @@
         DocumentBuilderFactory.newInstance();
     }
 }
-
-
--- a/jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/ptests/SAXFactoryNewInstanceTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/ptests/SAXFactoryNewInstanceTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -78,5 +78,3 @@
     }
 
 }
-
-
--- a/jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/ptests/SAXParserFactTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/ptests/SAXParserFactTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -229,5 +229,3 @@
         assertFalse(spf.getFeature(EXTERNAL_P_ENTITIES));
     }
 }
-
-
--- a/jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/ptests/SAXParserTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/ptests/SAXParserTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -502,5 +502,3 @@
         }
     }
 }
-
-
--- a/jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/ptests/SAXParserTest02.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/ptests/SAXParserTest02.java	Fri Sep 16 13:15:02 2016 -0700
@@ -269,5 +269,3 @@
         }
     }
 }
-
-
--- a/jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/ptests/SAXParserTest03.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/ptests/SAXParserTest03.java	Fri Sep 16 13:15:02 2016 -0700
@@ -116,5 +116,3 @@
     }
 
 }
-
-
--- a/jaxp/test/javax/xml/jaxp/functional/javax/xml/stream/ptests/XMLEventFactoryNewInstanceTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/javax/xml/stream/ptests/XMLEventFactoryNewInstanceTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -82,4 +82,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/functional/javax/xml/stream/ptests/XMLInputFactoryNewInstanceTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/javax/xml/stream/ptests/XMLInputFactoryNewInstanceTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -82,4 +82,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/Bug6384418Test.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/Bug6384418Test.java	Fri Sep 16 13:15:02 2016 -0700
@@ -67,5 +67,3 @@
     }
 
 }
-
-
--- a/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/DOMResultTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/DOMResultTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -118,5 +118,3 @@
                 writeNodes(kids.item(i), bWriter);
     }
 }
-
-
--- a/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/ErrorListenerTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/ErrorListenerTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -104,5 +104,3 @@
         this.status = ListenerStatus.FATAL;
     }
 }
-
-
--- a/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/SAXSourceTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/SAXSourceTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -105,5 +105,3 @@
         }
     }
 }
-
-
--- a/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/SAXTFactoryTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/SAXTFactoryTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -431,5 +431,3 @@
         assertTrue(compareWithGold(goldFile, outputFile));
     }
 }
-
-
--- a/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/StreamResultTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/StreamResultTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -106,5 +106,3 @@
         });
     }
 }
-
-
--- a/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/TfClearParamTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/TfClearParamTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -239,5 +239,3 @@
         assertNull(transformer.getParameter(LONG_PARAM_NAME));
     }
 }
-
-
--- a/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/TransformTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/TransformTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -384,5 +384,3 @@
     private Document xmlDoc;
 
 }
-
-
--- a/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/TransformerExcpTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/TransformerExcpTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -105,5 +105,3 @@
         assertNotNull(te.initCause(null));
     }
 }
-
-
--- a/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/TransformerFactoryTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/TransformerFactoryTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -141,5 +141,3 @@
         assertTrue(compareWithGold(goldFile, outputFile));
     }
 }
-
-
--- a/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/TransformerTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/TransformerTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -207,5 +207,3 @@
         System.out.println(" In fatal");
     }
 }
-
-
--- a/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/TransformerTest02.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/TransformerTest02.java	Fri Sep 16 13:15:02 2016 -0700
@@ -85,5 +85,3 @@
         assertTrue(compareWithGold(goldFile, outputFile));
     }
 }
-
-
--- a/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/TransformerTest03.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/TransformerTest03.java	Fri Sep 16 13:15:02 2016 -0700
@@ -94,5 +94,3 @@
         assertTrue(compareWithGold(goldFile, outputFile));
     }
 }
-
-
--- a/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/URIResolverTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/URIResolverTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -262,5 +262,3 @@
         }
     }
 }
-
-
--- a/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/othervm/TFCErrorTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/othervm/TFCErrorTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -54,5 +54,3 @@
         }
     }
 }
-
-
--- a/jaxp/test/javax/xml/jaxp/functional/javax/xml/validation/ptests/SchemaFactoryTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/javax/xml/validation/ptests/SchemaFactoryTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -404,4 +404,3 @@
     private Document xsdDoc2;
     private byte[] xml;
 }
-
--- a/jaxp/test/javax/xml/jaxp/functional/javax/xml/validation/ptests/TypeInfoProviderTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/javax/xml/validation/ptests/TypeInfoProviderTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -95,4 +95,3 @@
 
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/functional/javax/xml/validation/ptests/ValidatorHandlerTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/javax/xml/validation/ptests/ValidatorHandlerTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -148,4 +148,3 @@
     private Schema schema;
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/functional/javax/xml/validation/ptests/ValidatorTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/javax/xml/validation/ptests/ValidatorTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -209,4 +209,3 @@
     private Document xmlDoc;
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/functional/javax/xml/xpath/ptests/XPathExpressionTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/javax/xml/xpath/ptests/XPathExpressionTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -491,5 +491,3 @@
         }
     }
 }
-
-
--- a/jaxp/test/javax/xml/jaxp/functional/javax/xml/xpath/ptests/XPathFactoryTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/javax/xml/xpath/ptests/XPathFactoryTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -218,5 +218,3 @@
         assertNotNull(XPathFactory.newInstance(DOM_OBJECT_MODEL));
     }
 }
-
-
--- a/jaxp/test/javax/xml/jaxp/functional/javax/xml/xpath/ptests/XPathFunctionResolverTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/javax/xml/xpath/ptests/XPathFunctionResolverTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -82,5 +82,3 @@
         assertEquals(xpath.evaluate(null, "5"), "2");
     }
 }
-
-
--- a/jaxp/test/javax/xml/jaxp/functional/javax/xml/xpath/ptests/XPathTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/javax/xml/xpath/ptests/XPathTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -757,5 +757,3 @@
         }
     }
 }
-
-
--- a/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/AttrTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/AttrTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -151,4 +151,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/CommentTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/CommentTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -48,4 +48,3 @@
         return document.createComment(text);
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/DocumentTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/DocumentTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -175,4 +175,3 @@
         doc.createElement("!nc$%^*(!");
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/DocumentTypeTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/DocumentTypeTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -92,4 +92,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/DomImplementationTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/DomImplementationTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -129,4 +129,3 @@
         assertEquals(documentType.getName(), name);
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/ElementTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/ElementTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -255,4 +255,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/EntityChildTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/EntityChildTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -61,4 +61,3 @@
         assertEquals(nl.getLength(), 3);
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/NamedNodeMapTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/NamedNodeMapTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -121,4 +121,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/NodeListTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/NodeListTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -64,4 +64,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/NodeTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/NodeTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -211,4 +211,3 @@
         transformer.transform(domSource, streamResult);
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/NotationTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/NotationTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -74,4 +74,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/PITest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/PITest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -54,4 +54,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/TextTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/TextTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -74,4 +74,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/TypeInfoTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/TypeInfoTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -140,4 +140,3 @@
 
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/AttrImplTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/AttrImplTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -202,5 +202,3 @@
         attr.removeAttribute(1);
     }
 }
-
-
--- a/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/AttributesNSTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/AttributesNSTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -74,5 +74,3 @@
         assertTrue(compareWithGold(goldFile, outputFile));
     }
 }
-
-
--- a/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/AttributesTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/AttributesTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -76,5 +76,3 @@
         assertTrue(compareWithGold(goldFile, outputFile));
     }
 }
-
-
--- a/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/ContentHandlerTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/ContentHandlerTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -264,5 +264,3 @@
             bWriter.close();
     }
 }
-
-
--- a/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/DefaultHandlerTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/DefaultHandlerTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -272,5 +272,3 @@
         }
     }
 }
-
-
--- a/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/EHFatalTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/EHFatalTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -135,5 +135,3 @@
         bWriter.close();
     }
 }
-
-
--- a/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/NSSupportTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/NSSupportTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -131,5 +131,3 @@
         assertNull(support.getURI(DC_PREFIX));
     }
 }
-
-
--- a/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/NSTableTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/NSTableTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -168,5 +168,3 @@
         assertFalse(spf.getFeature(NAMESPACE_PREFIXES));
     }
 }
-
-
--- a/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/ParserAdapterTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/ParserAdapterTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -265,5 +265,3 @@
         }
     }
 }
-
-
--- a/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/ResolverTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/ResolverTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -143,5 +143,3 @@
         }
     }
 }
-
-
--- a/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/SAXParserNSTableTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/SAXParserNSTableTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -107,5 +107,3 @@
         assertTrue(compareWithGold(goldFile, outputFile));
     }
 }
-
-
--- a/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/XMLFilterCBTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/XMLFilterCBTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -285,5 +285,3 @@
             bWriter.close();
     }
 }
-
-
--- a/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/XMLFilterTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/XMLFilterTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -246,5 +246,3 @@
         }
     }
 }
-
-
--- a/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/XMLReaderAdapterTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/XMLReaderAdapterTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -112,5 +112,3 @@
         }
     }
 }
-
-
--- a/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/XMLReaderFactoryTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/XMLReaderFactoryTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -76,5 +76,3 @@
         XMLReaderFactory.createXMLReader("org.apache.crimson.parser.ABCD");
     }
 }
-
-
--- a/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/XMLReaderNSTableTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/XMLReaderNSTableTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -131,5 +131,3 @@
         assertTrue(compareWithGold(goldFile, outputFile));
     }
 }
-
-
--- a/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/XMLReaderTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/XMLReaderTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -671,5 +671,3 @@
     public void internalEntityDecl(String name, String value) {
     }
 }
-
-
--- a/jaxp/test/javax/xml/jaxp/functional/test/astro/AstroTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/test/astro/AstroTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -145,4 +145,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/functional/test/astro/DocumentLSTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/test/astro/DocumentLSTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -182,4 +182,3 @@
         return dbf.newDocumentBuilder();
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/functional/test/astro/NamespaceContextTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/test/astro/NamespaceContextTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -89,4 +89,3 @@
         assertEquals(QName.valueOf(qname.toString()), qname);
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/functional/test/astro/SAX201Test.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/test/astro/SAX201Test.java	Fri Sep 16 13:15:02 2016 -0700
@@ -48,4 +48,3 @@
         reader.setDTDHandler(null); // SAX 2.0.1 allows
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/functional/test/astro/SchemaValidationTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/test/astro/SchemaValidationTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -76,4 +76,3 @@
         return spf.newSAXParser();
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/functional/test/astro/XPathAPITest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/test/astro/XPathAPITest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -171,4 +171,3 @@
         return new InputSource(filenameToURL(ASTROCAT));
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/functional/test/auctionportal/AuctionController.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/test/auctionportal/AuctionController.java	Fri Sep 16 13:15:02 2016 -0700
@@ -366,5 +366,3 @@
         assertTrue(roletypeInfo.getTypeNamespace().equals(PORTAL_ACCOUNT_NS));
     }
 }
-
-
--- a/jaxp/test/javax/xml/jaxp/functional/test/auctionportal/AuctionItemRepository.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/test/auctionportal/AuctionItemRepository.java	Fri Sep 16 13:15:02 2016 -0700
@@ -371,5 +371,3 @@
         assertTrue(compareDocumentWithGold(goldFile, resultFile));
     }
 }
-
-
--- a/jaxp/test/javax/xml/jaxp/functional/test/auctionportal/UserController.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/test/auctionportal/UserController.java	Fri Sep 16 13:15:02 2016 -0700
@@ -304,5 +304,3 @@
         assertTrue(compareDocumentWithGold(goldFile, resultFile));
     }
 }
-
-
--- a/jaxp/test/javax/xml/jaxp/functional/test/gaptest/Bug4511326.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/test/gaptest/Bug4511326.java	Fri Sep 16 13:15:02 2016 -0700
@@ -64,4 +64,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/functional/test/gaptest/Bug4512806.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/test/gaptest/Bug4512806.java	Fri Sep 16 13:15:02 2016 -0700
@@ -90,4 +90,3 @@
 
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/functional/test/gaptest/Bug4515047.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/test/gaptest/Bug4515047.java	Fri Sep 16 13:15:02 2016 -0700
@@ -62,4 +62,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/functional/test/gaptest/Bug4515660.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/test/gaptest/Bug4515660.java	Fri Sep 16 13:15:02 2016 -0700
@@ -128,4 +128,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/functional/test/gaptest/Bug4693341.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/test/gaptest/Bug4693341.java	Fri Sep 16 13:15:02 2016 -0700
@@ -81,4 +81,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/functional/test/gaptest/Bug4848653.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/test/gaptest/Bug4848653.java	Fri Sep 16 13:15:02 2016 -0700
@@ -81,4 +81,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/functional/test/gaptest/Bug4858685.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/functional/test/gaptest/Bug4858685.java	Fri Sep 16 13:15:02 2016 -0700
@@ -247,4 +247,3 @@
 
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/module/ServiceProviderTest/src/test/module-info.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/module/ServiceProviderTest/src/test/module-info.java	Fri Sep 16 13:15:02 2016 -0700
@@ -24,4 +24,4 @@
 module test {
     requires java.xml;
     exports test;
-}
\ No newline at end of file
+}
--- a/jaxp/test/javax/xml/jaxp/module/ServiceProviderTest/src/xmlprovider1/module-info.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/module/ServiceProviderTest/src/xmlprovider1/module-info.java	Fri Sep 16 13:15:02 2016 -0700
@@ -31,4 +31,4 @@
     provides javax.xml.transform.TransformerFactory with xp1.TransformerFactoryImpl;
     provides javax.xml.validation.SchemaFactory with xp1.SchemaFactoryImpl;
     provides javax.xml.xpath.XPathFactory with xp1.XPathFactoryImpl;
-}
\ No newline at end of file
+}
--- a/jaxp/test/javax/xml/jaxp/module/ServiceProviderTest/src/xmlprovider2/module-info.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/module/ServiceProviderTest/src/xmlprovider2/module-info.java	Fri Sep 16 13:15:02 2016 -0700
@@ -27,4 +27,4 @@
     provides javax.xml.datatype.DatatypeFactory with xp2.DatatypeFactoryImpl;
     provides javax.xml.stream.XMLEventFactory with xp2.XMLEventFactoryImpl;
     provides org.xml.sax.XMLReader with xp2.XMLReaderImpl;
-}
\ No newline at end of file
+}
--- a/jaxp/test/javax/xml/jaxp/unittest/common/Bug6350682.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/common/Bug6350682.java	Fri Sep 16 13:15:02 2016 -0700
@@ -75,4 +75,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/common/Bug6723276Test.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/common/Bug6723276Test.java	Fri Sep 16 13:15:02 2016 -0700
@@ -68,4 +68,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/common/Bug6941169Test.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/common/Bug6941169Test.java	Fri Sep 16 13:15:02 2016 -0700
@@ -486,4 +486,3 @@
         return document;
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/common/Bug7143711Test.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/common/Bug7143711Test.java	Fri Sep 16 13:15:02 2016 -0700
@@ -114,4 +114,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/common/Sources.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/common/Sources.java	Fri Sep 16 13:15:02 2016 -0700
@@ -213,4 +213,3 @@
         return r;
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/common/TestSAXDriver.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/common/TestSAXDriver.java	Fri Sep 16 13:15:02 2016 -0700
@@ -56,4 +56,3 @@
 
     private static final String ENT_EXP_LIMIT_PROP = "http://www.oracle.com/xml/jaxp/properties/entityExpansionLimit";
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/common/TransformationWarningsTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/common/TransformationWarningsTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -105,4 +105,3 @@
             + "</xsl:stylesheet>";
     private static final String xml = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><root></root>";
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/common/ValidationWarningsTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/common/ValidationWarningsTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -85,4 +85,3 @@
     private static final String xml = "<?xml version='1.0'?><test>Element</test>";
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/datatype/Bug6320118.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/datatype/Bug6320118.java	Fri Sep 16 13:15:02 2016 -0700
@@ -108,4 +108,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/datatype/Bug6937951Test.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/datatype/Bug6937951Test.java	Fri Sep 16 13:15:02 2016 -0700
@@ -57,4 +57,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/datatype/Bug6937964Test.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/datatype/Bug6937964Test.java	Fri Sep 16 13:15:02 2016 -0700
@@ -270,4 +270,3 @@
 
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/datatype/Bug7042647Test.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/datatype/Bug7042647Test.java	Fri Sep 16 13:15:02 2016 -0700
@@ -60,4 +60,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/datatype/DatatypeFactoryTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/datatype/DatatypeFactoryTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -640,4 +640,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/datatype/DurationTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/datatype/DurationTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -484,4 +484,3 @@
 
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/datatype/FactoryFindTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/datatype/FactoryFindTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -76,4 +76,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/datatype/JDK8068839Test.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/datatype/JDK8068839Test.java	Fri Sep 16 13:15:02 2016 -0700
@@ -51,4 +51,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/datatype/XMLGregorianCalendarTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/datatype/XMLGregorianCalendarTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -228,4 +228,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/dom/Bug4915524.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug4915524.java	Fri Sep 16 13:15:02 2016 -0700
@@ -81,4 +81,3 @@
         return docBuilder.parse(source);
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/dom/Bug4915748.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug4915748.java	Fri Sep 16 13:15:02 2016 -0700
@@ -74,4 +74,3 @@
         Assert.assertTrue(hadError[0]);
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/dom/Bug4966082.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug4966082.java	Fri Sep 16 13:15:02 2016 -0700
@@ -53,4 +53,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/dom/Bug4966138.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug4966138.java	Fri Sep 16 13:15:02 2016 -0700
@@ -69,4 +69,3 @@
         Assert.assertTrue(typeNs.length() != 0, "returned typeNamespace shouldn't be empty");
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/dom/Bug4966142.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug4966142.java	Fri Sep 16 13:15:02 2016 -0700
@@ -61,4 +61,3 @@
         Assert.assertFalse(type.isDerivedFrom("testNS", "Test", TypeInfo.DERIVATION_UNION));
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/dom/Bug4966143.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug4966143.java	Fri Sep 16 13:15:02 2016 -0700
@@ -66,4 +66,3 @@
         Assert.assertTrue(type.isDerivedFrom("testNS", "Test", 0));
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/dom/Bug6339023.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug6339023.java	Fri Sep 16 13:15:02 2016 -0700
@@ -139,4 +139,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/dom/Bug6355326.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug6355326.java	Fri Sep 16 13:15:02 2016 -0700
@@ -118,4 +118,3 @@
         return p;
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/dom/Bug6367542.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug6367542.java	Fri Sep 16 13:15:02 2016 -0700
@@ -52,4 +52,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/dom/Bug6520131.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug6520131.java	Fri Sep 16 13:15:02 2016 -0700
@@ -83,4 +83,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/dom/Bug6521260.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug6521260.java	Fri Sep 16 13:15:02 2016 -0700
@@ -77,4 +77,3 @@
         Assert.assertEquals(systemId, systemId2);
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/dom/Bug6582545Test.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug6582545Test.java	Fri Sep 16 13:15:02 2016 -0700
@@ -123,4 +123,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/dom/Bug6879614Test.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug6879614Test.java	Fri Sep 16 13:15:02 2016 -0700
@@ -78,4 +78,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/dom/CR6333993Test.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/dom/CR6333993Test.java	Fri Sep 16 13:15:02 2016 -0700
@@ -88,4 +88,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/dom/CR6517707Test.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/dom/CR6517707Test.java	Fri Sep 16 13:15:02 2016 -0700
@@ -128,4 +128,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/dom/CR6517717Test.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/dom/CR6517717Test.java	Fri Sep 16 13:15:02 2016 -0700
@@ -86,4 +86,3 @@
 
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/dom/CR6909336Test.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/dom/CR6909336Test.java	Fri Sep 16 13:15:02 2016 -0700
@@ -72,4 +72,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/dom/DOMConfigurationTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/dom/DOMConfigurationTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -1628,4 +1628,3 @@
 
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/dom/DOMXPathTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/dom/DOMXPathTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -54,4 +54,3 @@
         Assert.assertEquals(domImpl.getFeature("+XPath", "3.0"), null);
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/dom/ElementTraversal.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/dom/ElementTraversal.java	Fri Sep 16 13:15:02 2016 -0700
@@ -135,4 +135,3 @@
         return doc;
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/dom/JdkXmlDomTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/dom/JdkXmlDomTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -46,4 +46,3 @@
         Assert.assertTrue(runWithAllPerm(() -> cls.getClassLoader()) != null);
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/dom/TCKEncodingTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/dom/TCKEncodingTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -102,4 +102,3 @@
         System.out.println("OK");
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/dom/ls/Bug4973153.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/dom/ls/Bug4973153.java	Fri Sep 16 13:15:02 2016 -0700
@@ -204,4 +204,3 @@
         return true;
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/dom/ls/Bug6290947.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/dom/ls/Bug6290947.java	Fri Sep 16 13:15:02 2016 -0700
@@ -147,4 +147,3 @@
         return src;
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/dom/ls/Bug6354955.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/dom/ls/Bug6354955.java	Fri Sep 16 13:15:02 2016 -0700
@@ -142,4 +142,3 @@
         return documentBuilder.newDocument();
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/dom/ls/Bug6376823.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/dom/ls/Bug6376823.java	Fri Sep 16 13:15:02 2016 -0700
@@ -121,4 +121,3 @@
         return src;
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/dom/ls/Bug6710741Test.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/dom/ls/Bug6710741Test.java	Fri Sep 16 13:15:02 2016 -0700
@@ -80,4 +80,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/dom/ls/LSParserTCKTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/dom/ls/LSParserTCKTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -584,4 +584,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/dom/ls/LSParserTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/dom/ls/LSParserTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -109,4 +109,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/dom/ls/LSSerializerTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/dom/ls/LSSerializerTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -319,4 +319,3 @@
         Assert.assertEquals(XML11_DOCUMENT_OUTPUT, defaultSerialization, "Invalid serialization of XML 1.1 document: ");
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4674384_MAX_OCCURS_Test.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4674384_MAX_OCCURS_Test.java	Fri Sep 16 13:15:02 2016 -0700
@@ -70,4 +70,3 @@
         System.out.println("Success: File " + XML_FILE_NAME + " was parsed with a large value of maxOccurs.");
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4934208.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4934208.java	Fri Sep 16 13:15:02 2016 -0700
@@ -74,4 +74,3 @@
         r.parse(is);
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4967002.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4967002.java	Fri Sep 16 13:15:02 2016 -0700
@@ -101,4 +101,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4985486.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4985486.java	Fri Sep 16 13:15:02 2016 -0700
@@ -68,4 +68,3 @@
 
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4991020.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4991020.java	Fri Sep 16 13:15:02 2016 -0700
@@ -56,4 +56,3 @@
         parser.parse(Bug4991020.class.getResource("Bug4991020.xml").toExternalForm(), new util.DraconianErrorHandler());
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4991946.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4991946.java	Fri Sep 16 13:15:02 2016 -0700
@@ -56,4 +56,3 @@
         parser.parse(Bug4991946.class.getResource("Bug4991946.xml").toExternalForm(), new util.DraconianErrorHandler());
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug5010072.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug5010072.java	Fri Sep 16 13:15:02 2016 -0700
@@ -77,4 +77,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug5025825.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug5025825.java	Fri Sep 16 13:15:02 2016 -0700
@@ -89,4 +89,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6309988.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6309988.java	Fri Sep 16 13:15:02 2016 -0700
@@ -370,4 +370,3 @@
         return System.getSecurityManager() != null;
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6341770.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6341770.java	Fri Sep 16 13:15:02 2016 -0700
@@ -83,4 +83,3 @@
         System.out.println("OK.");
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6361283.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6361283.java	Fri Sep 16 13:15:02 2016 -0700
@@ -56,4 +56,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6506304Test.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6506304Test.java	Fri Sep 16 13:15:02 2016 -0700
@@ -71,4 +71,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6518733.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6518733.java	Fri Sep 16 13:15:02 2016 -0700
@@ -67,4 +67,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6564400.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6564400.java	Fri Sep 16 13:15:02 2016 -0700
@@ -180,4 +180,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6573786.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6573786.java	Fri Sep 16 13:15:02 2016 -0700
@@ -73,4 +73,3 @@
 
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6573786ErrorHandler.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6573786ErrorHandler.java	Fri Sep 16 13:15:02 2016 -0700
@@ -45,4 +45,3 @@
         System.out.println(e.getMessage());
     } // warning ()
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6594813.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6594813.java	Fri Sep 16 13:15:02 2016 -0700
@@ -175,4 +175,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6608841.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6608841.java	Fri Sep 16 13:15:02 2016 -0700
@@ -59,4 +59,3 @@
     public class MyHandler extends DefaultHandler {
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6690015.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6690015.java	Fri Sep 16 13:15:02 2016 -0700
@@ -87,4 +87,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6760982.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6760982.java	Fri Sep 16 13:15:02 2016 -0700
@@ -168,4 +168,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6849942Test.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6849942Test.java	Fri Sep 16 13:15:02 2016 -0700
@@ -81,4 +81,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug7157608Test.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug7157608Test.java	Fri Sep 16 13:15:02 2016 -0700
@@ -218,4 +218,3 @@
         boolean validating = false;
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug7166896Test.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug7166896Test.java	Fri Sep 16 13:15:02 2016 -0700
@@ -80,4 +80,3 @@
 
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug8003147Test.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug8003147Test.java	Fri Sep 16 13:15:02 2016 -0700
@@ -93,4 +93,3 @@
         }, new FilePermission(getSystemProperty("test.classes") + "/-", "read,write"));
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug8003147TestClass.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug8003147TestClass.java	Fri Sep 16 13:15:02 2016 -0700
@@ -32,4 +32,3 @@
     public void doSomething(double d, ArrayList<Integer> list) {
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug8073385.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug8073385.java	Fri Sep 16 13:15:02 2016 -0700
@@ -100,4 +100,3 @@
         assertTrue(exceptionText.contains("Unicode: " + hexString));
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/parsers/FactoryFindTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/FactoryFindTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -75,4 +75,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/parsers/MyDefaultHandler.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/MyDefaultHandler.java	Fri Sep 16 13:15:02 2016 -0700
@@ -45,4 +45,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/parsers/MyErrorHandler.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/MyErrorHandler.java	Fri Sep 16 13:15:02 2016 -0700
@@ -53,4 +53,3 @@
         errorOccured = true;
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/parsers/ParseEmptyStream.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/ParseEmptyStream.java	Fri Sep 16 13:15:02 2016 -0700
@@ -92,4 +92,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/parsers/SupplementaryChars.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/SupplementaryChars.java	Fri Sep 16 13:15:02 2016 -0700
@@ -71,4 +71,3 @@
         return parser;
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/parsers/xinclude/Bug6794483Test.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/xinclude/Bug6794483Test.java	Fri Sep 16 13:15:02 2016 -0700
@@ -107,4 +107,3 @@
 
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/sax/Attributes2ImplTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/sax/Attributes2ImplTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -153,4 +153,3 @@
         Assert.assertTrue(impl1.getQName(2).equals(impl3.getQName(2)));
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/sax/Bug6889654Test.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/sax/Bug6889654Test.java	Fri Sep 16 13:15:02 2016 -0700
@@ -87,4 +87,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/sax/Bug6925410Test.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/sax/Bug6925410Test.java	Fri Sep 16 13:15:02 2016 -0700
@@ -60,4 +60,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/sax/Bug6949607Test.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/sax/Bug6949607Test.java	Fri Sep 16 13:15:02 2016 -0700
@@ -81,4 +81,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/sax/Bug6992561Test.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/sax/Bug6992561Test.java	Fri Sep 16 13:15:02 2016 -0700
@@ -86,4 +86,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/sax/Bug7057778Test.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/sax/Bug7057778Test.java	Fri Sep 16 13:15:02 2016 -0700
@@ -199,4 +199,3 @@
 
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/sax/DefaultHandler2Test.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/sax/DefaultHandler2Test.java	Fri Sep 16 13:15:02 2016 -0700
@@ -251,4 +251,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/sax/IssueTracker56Test.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/sax/IssueTracker56Test.java	Fri Sep 16 13:15:02 2016 -0700
@@ -142,4 +142,3 @@
 
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/sax/MyDefaultHandler2.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/sax/MyDefaultHandler2.java	Fri Sep 16 13:15:02 2016 -0700
@@ -198,4 +198,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/sax/NSSupportTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/sax/NSSupportTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -232,4 +232,3 @@
         Assert.assertNull(nssupport.getURI(""));
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/sax/SAXExceptionExt.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/sax/SAXExceptionExt.java	Fri Sep 16 13:15:02 2016 -0700
@@ -38,4 +38,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/sax/XMLReaderTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/sax/XMLReaderTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -70,4 +70,3 @@
         XMLReaderAdapter adapter = new XMLReaderAdapter();
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/AttributeLocalNameTest/AttributeLocalNameTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/AttributeLocalNameTest/AttributeLocalNameTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -66,4 +66,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/Bug6370703.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/Bug6370703.java	Fri Sep 16 13:15:02 2016 -0700
@@ -69,4 +69,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/Bug6378422.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/Bug6378422.java	Fri Sep 16 13:15:02 2016 -0700
@@ -51,4 +51,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/Bug6380870.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/Bug6380870.java	Fri Sep 16 13:15:02 2016 -0700
@@ -58,4 +58,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/Bug6489502.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/Bug6489502.java	Fri Sep 16 13:15:02 2016 -0700
@@ -83,4 +83,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/Bug6509774.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/Bug6509774.java	Fri Sep 16 13:15:02 2016 -0700
@@ -174,4 +174,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/Bug6688002Test.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/Bug6688002Test.java	Fri Sep 16 13:15:02 2016 -0700
@@ -113,4 +113,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/Bug6976938Test.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/Bug6976938Test.java	Fri Sep 16 13:15:02 2016 -0700
@@ -100,4 +100,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/CoalesceTest/CoalesceTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/CoalesceTest/CoalesceTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -110,4 +110,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/EntitiesTest/EntityTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/EntitiesTest/EntityTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -179,4 +179,3 @@
         return true;
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/EventReaderDelegateTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/EventReaderDelegateTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -231,4 +231,3 @@
 
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/EventsTest/Issue41Test.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/EventsTest/Issue41Test.java	Fri Sep 16 13:15:02 2016 -0700
@@ -178,4 +178,3 @@
         System.out.println(sw.toString());
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/EventsTest/Issue48Test.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/EventsTest/Issue48Test.java	Fri Sep 16 13:15:02 2016 -0700
@@ -115,4 +115,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/EventsTest/Issue53Test.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/EventsTest/Issue53Test.java	Fri Sep 16 13:15:02 2016 -0700
@@ -71,4 +71,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/EventsTest/Issue58Test.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/EventsTest/Issue58Test.java	Fri Sep 16 13:15:02 2016 -0700
@@ -84,4 +84,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/FactoryFindTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/FactoryFindTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -151,4 +151,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/IgnoreExternalDTDTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/IgnoreExternalDTDTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -77,4 +77,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/ProcessingInstructionTest/ProcessingInstructionTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/ProcessingInstructionTest/ProcessingInstructionTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -67,4 +67,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/StreamReaderDelegateTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/StreamReaderDelegateTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -383,4 +383,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventLocationTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventLocationTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -82,4 +82,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6489890.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6489890.java	Fri Sep 16 13:15:02 2016 -0700
@@ -77,4 +77,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6555001.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6555001.java	Fri Sep 16 13:15:02 2016 -0700
@@ -116,4 +116,3 @@
         }, new FilePermission("/tmp/this/does/not/exist/but/that/is/ok", "read"));
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6586466Test.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6586466Test.java	Fri Sep 16 13:15:02 2016 -0700
@@ -66,4 +66,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6613059Test.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6613059Test.java	Fri Sep 16 13:15:02 2016 -0700
@@ -89,4 +89,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6668115Test.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6668115Test.java	Fri Sep 16 13:15:02 2016 -0700
@@ -100,4 +100,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6846133Test.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6846133Test.java	Fri Sep 16 13:15:02 2016 -0700
@@ -83,4 +83,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug8153781.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug8153781.java	Fri Sep 16 13:15:02 2016 -0700
@@ -94,4 +94,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Issue40Test.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Issue40Test.java	Fri Sep 16 13:15:02 2016 -0700
@@ -100,4 +100,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventWriterTest/ReaderToWriterTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventWriterTest/ReaderToWriterTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -214,4 +214,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventWriterTest/XMLEventWriterTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventWriterTest/XMLEventWriterTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -156,4 +156,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLInputFactoryTest/Bug6756677Test.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLInputFactoryTest/Bug6756677Test.java	Fri Sep 16 13:15:02 2016 -0700
@@ -113,4 +113,3 @@
         Assert.assertTrue(xif instanceof XMLInputFactory, "xif should be an instance of XMLInputFactory");
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLInputFactoryTest/Bug6909759Test.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLInputFactoryTest/Bug6909759Test.java	Fri Sep 16 13:15:02 2016 -0700
@@ -66,4 +66,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLInputFactoryTest/IssueTracker38.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLInputFactoryTest/IssueTracker38.java	Fri Sep 16 13:15:02 2016 -0700
@@ -92,4 +92,3 @@
 
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLInputFactoryTest/MyInputFactory.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLInputFactoryTest/MyInputFactory.java	Fri Sep 16 13:15:02 2016 -0700
@@ -158,4 +158,3 @@
         throw new UnsupportedOperationException("Not supported yet.");
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLOutputFactoryTest/Bug6846132Test.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLOutputFactoryTest/Bug6846132Test.java	Fri Sep 16 13:15:02 2016 -0700
@@ -89,4 +89,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLOutputFactoryTest/DuplicateNSDeclarationTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLOutputFactoryTest/DuplicateNSDeclarationTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -83,4 +83,3 @@
         Assert.assertEquals(EXPECTED_OUTPUT, buffer.toString());
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLOutputFactoryTest/StreamResultTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLOutputFactoryTest/StreamResultTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -162,4 +162,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLResolverTest/XMLResolverTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLResolverTest/XMLResolverTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -96,4 +96,3 @@
 
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamExceptionTest/ExceptionTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamExceptionTest/ExceptionTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -53,4 +53,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamFilterTest/Bug6481615.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamFilterTest/Bug6481615.java	Fri Sep 16 13:15:02 2016 -0700
@@ -68,4 +68,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamFilterTest/Bug6481678.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamFilterTest/Bug6481678.java	Fri Sep 16 13:15:02 2016 -0700
@@ -225,4 +225,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamFilterTest/HasNextTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamFilterTest/HasNextTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -145,4 +145,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamFilterTest/HasNextTypeFilter.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamFilterTest/HasNextTypeFilter.java	Fri Sep 16 13:15:02 2016 -0700
@@ -47,4 +47,3 @@
         return types[r.getEventType()];
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/BOMTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/BOMTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -67,4 +67,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Bug6388460.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Bug6388460.java	Fri Sep 16 13:15:02 2016 -0700
@@ -76,4 +76,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Bug6472982Test.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Bug6472982Test.java	Fri Sep 16 13:15:02 2016 -0700
@@ -79,4 +79,3 @@
         return sbuffer.toString();
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Bug6767322Test.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Bug6767322Test.java	Fri Sep 16 13:15:02 2016 -0700
@@ -76,4 +76,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Bug6847819Test.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Bug6847819Test.java	Fri Sep 16 13:15:02 2016 -0700
@@ -69,4 +69,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/BugTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/BugTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -51,4 +51,3 @@
         Assert.assertEquals(XMLStreamConstants.START_DOCUMENT, r.getEventType());
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/DefaultAttributeTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/DefaultAttributeTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -108,4 +108,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/DoubleXmlnsTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/DoubleXmlnsTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -118,4 +118,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IsValidatingTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IsValidatingTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -165,4 +165,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Issue44Test.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Issue44Test.java	Fri Sep 16 13:15:02 2016 -0700
@@ -59,4 +59,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Issue47Test.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Issue47Test.java	Fri Sep 16 13:15:02 2016 -0700
@@ -89,4 +89,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IssueTracker24.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IssueTracker24.java	Fri Sep 16 13:15:02 2016 -0700
@@ -61,4 +61,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IssueTracker35.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IssueTracker35.java	Fri Sep 16 13:15:02 2016 -0700
@@ -59,4 +59,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IssueTracker70.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IssueTracker70.java	Fri Sep 16 13:15:02 2016 -0700
@@ -76,4 +76,3 @@
         Assert.assertNotNull(value, "should have attribute value");
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Jsr173MR1Req5Test.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Jsr173MR1Req5Test.java	Fri Sep 16 13:15:02 2016 -0700
@@ -91,4 +91,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Jsr173MR1Req8Test.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Jsr173MR1Req8Test.java	Fri Sep 16 13:15:02 2016 -0700
@@ -69,4 +69,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/NamespaceTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/NamespaceTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -153,4 +153,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/StreamReaderTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/StreamReaderTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -62,4 +62,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/SupportDTDTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/SupportDTDTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -288,4 +288,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/VoiceXMLDTDTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/VoiceXMLDTDTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -58,4 +58,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/XML11Test.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/XML11Test.java	Fri Sep 16 13:15:02 2016 -0700
@@ -54,4 +54,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/AttributeEscapeTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/AttributeEscapeTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -103,4 +103,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/Bug6452107.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/Bug6452107.java	Fri Sep 16 13:15:02 2016 -0700
@@ -64,4 +64,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/Bug6600882Test.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/Bug6600882Test.java	Fri Sep 16 13:15:02 2016 -0700
@@ -59,4 +59,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/Bug6675332Test.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/Bug6675332Test.java	Fri Sep 16 13:15:02 2016 -0700
@@ -164,4 +164,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/Bug7037352Test.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/Bug7037352Test.java	Fri Sep 16 13:15:02 2016 -0700
@@ -65,4 +65,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/DOMUtil.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/DOMUtil.java	Fri Sep 16 13:15:02 2016 -0700
@@ -221,4 +221,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/DomUtilTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/DomUtilTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -124,4 +124,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/EmptyElementTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/EmptyElementTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -85,4 +85,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/EncodingTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/EncodingTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -110,4 +110,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/NamespaceTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/NamespaceTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -1434,4 +1434,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/NullUriDetectionTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/NullUriDetectionTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -54,4 +54,3 @@
         w.writeCharacters("---");
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/SqeLinuxTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/SqeLinuxTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -88,4 +88,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/SurrogatesTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/SurrogatesTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -175,4 +175,3 @@
         };
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/UnprefixedNameTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/UnprefixedNameTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -125,4 +125,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/WriterTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/WriterTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -784,4 +784,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/XMLStreamWriterTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/XMLStreamWriterTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -73,4 +73,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/transform/Bug4693341Test.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug4693341Test.java	Fri Sep 16 13:15:02 2016 -0700
@@ -94,4 +94,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/transform/Bug4892774.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug4892774.java	Fri Sep 16 13:15:02 2016 -0700
@@ -377,4 +377,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/transform/Bug5073477.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug5073477.java	Fri Sep 16 13:15:02 2016 -0700
@@ -55,4 +55,3 @@
         r.setNextSibling(r.getNode().getFirstChild());
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6175602.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6175602.java	Fri Sep 16 13:15:02 2016 -0700
@@ -54,4 +54,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6206491.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6206491.java	Fri Sep 16 13:15:02 2016 -0700
@@ -134,4 +134,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6216226Test.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6216226Test.java	Fri Sep 16 13:15:02 2016 -0700
@@ -69,4 +69,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6311448.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6311448.java	Fri Sep 16 13:15:02 2016 -0700
@@ -85,4 +85,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6384805.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6384805.java	Fri Sep 16 13:15:02 2016 -0700
@@ -94,4 +94,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6465722.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6465722.java	Fri Sep 16 13:15:02 2016 -0700
@@ -72,4 +72,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6467808.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6467808.java	Fri Sep 16 13:15:02 2016 -0700
@@ -76,4 +76,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6490380.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6490380.java	Fri Sep 16 13:15:02 2016 -0700
@@ -61,4 +61,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6490921.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6490921.java	Fri Sep 16 13:15:02 2016 -0700
@@ -145,4 +145,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6513892.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6513892.java	Fri Sep 16 13:15:02 2016 -0700
@@ -77,4 +77,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6537167.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6537167.java	Fri Sep 16 13:15:02 2016 -0700
@@ -85,4 +85,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6540545.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6540545.java	Fri Sep 16 13:15:02 2016 -0700
@@ -64,4 +64,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6551616.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6551616.java	Fri Sep 16 13:15:02 2016 -0700
@@ -68,4 +68,3 @@
         // if it doesn't blow up, it succeeded.
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6559595.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6559595.java	Fri Sep 16 13:15:02 2016 -0700
@@ -70,4 +70,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6565260.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6565260.java	Fri Sep 16 13:15:02 2016 -0700
@@ -64,4 +64,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6940416.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6940416.java	Fri Sep 16 13:15:02 2016 -0700
@@ -115,4 +115,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/transform/BugDB12665704Test.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/BugDB12665704Test.java	Fri Sep 16 13:15:02 2016 -0700
@@ -157,4 +157,3 @@
         return sb.toString();
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/transform/CLITest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/CLITest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -50,4 +50,3 @@
         }, new PropertyPermission("*", "read,write"));
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/transform/CR6401137Test.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6401137Test.java	Fri Sep 16 13:15:02 2016 -0700
@@ -94,4 +94,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/transform/CR6551600Test.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6551600Test.java	Fri Sep 16 13:15:02 2016 -0700
@@ -94,4 +94,3 @@
                 : new FilePermission("///tmp/test.xml", "read,write,delete"));
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/transform/CR6577667Test.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6577667Test.java	Fri Sep 16 13:15:02 2016 -0700
@@ -59,4 +59,3 @@
 
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/transform/CR6652519Test.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6652519Test.java	Fri Sep 16 13:15:02 2016 -0700
@@ -79,4 +79,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/transform/CR6689809Test.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6689809Test.java	Fri Sep 16 13:15:02 2016 -0700
@@ -64,4 +64,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/transform/CR6905829Test.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6905829Test.java	Fri Sep 16 13:15:02 2016 -0700
@@ -65,4 +65,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/transform/CR6935697Test.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6935697Test.java	Fri Sep 16 13:15:02 2016 -0700
@@ -77,4 +77,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/transform/CR6941869Test.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6941869Test.java	Fri Sep 16 13:15:02 2016 -0700
@@ -76,4 +76,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/transform/CR6957215Test.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6957215Test.java	Fri Sep 16 13:15:02 2016 -0700
@@ -99,4 +99,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/transform/CR7098746Test.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/CR7098746Test.java	Fri Sep 16 13:15:02 2016 -0700
@@ -90,4 +90,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/transform/DOMResultTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/DOMResultTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -215,4 +215,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/transform/DocumentExtFunc.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/DocumentExtFunc.java	Fri Sep 16 13:15:02 2016 -0700
@@ -33,4 +33,3 @@
         return "["+node.getNodeName() + ":" + node.getTextContent()+"]";
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/transform/FactoryFindTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/FactoryFindTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -75,4 +75,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/transform/Issue2204Test.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Issue2204Test.java	Fri Sep 16 13:15:02 2016 -0700
@@ -67,4 +67,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/transform/Issue2290Test.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Issue2290Test.java	Fri Sep 16 13:15:02 2016 -0700
@@ -96,4 +96,3 @@
 
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/transform/OpenJDK100017Test.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/OpenJDK100017Test.java	Fri Sep 16 13:15:02 2016 -0700
@@ -66,4 +66,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/transform/SAX2DOMTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/SAX2DOMTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -198,4 +198,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/transform/SecureProcessingTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/SecureProcessingTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -135,4 +135,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/transform/SourceTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/SourceTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -148,4 +148,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/transform/StAXSourceTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/StAXSourceTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -129,4 +129,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/transform/TemplatesTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/TemplatesTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -83,4 +83,3 @@
             + "      contains($validAffectsRelClasses, @Class)]/@OBID)\"/>"
             + "</xsl:stylesheet>";
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/transform/TransformerFactoryTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/TransformerFactoryTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -153,4 +153,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/transform/TransformerTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/TransformerTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -439,4 +439,3 @@
         Assert.assertNull(document.getElementsByTagName("test6").item(0).getNamespaceURI(), "unexpected namespace for test6");
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/transform/TransformerUtilFactory.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/TransformerUtilFactory.java	Fri Sep 16 13:15:02 2016 -0700
@@ -56,4 +56,3 @@
             return null;
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/transform/VersionDefaultHandler.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/VersionDefaultHandler.java	Fri Sep 16 13:15:02 2016 -0700
@@ -62,4 +62,3 @@
         return encoding;
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/transform/VersionEventWriter.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/VersionEventWriter.java	Fri Sep 16 13:15:02 2016 -0700
@@ -82,4 +82,3 @@
         return encoding;
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/transform/XSLTFunctionsTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/XSLTFunctionsTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -23,9 +23,12 @@
 
 package transform;
 
+import java.io.IOException;
 import java.io.StringReader;
 import java.io.StringWriter;
-
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import javax.xml.transform.Source;
 import javax.xml.transform.Transformer;
 import javax.xml.transform.TransformerException;
@@ -54,8 +57,39 @@
  * @summary This class contains tests for XSLT functions.
  */
 
-@Listeners({jaxp.library.BasePolicy.class})
+@Listeners({jaxp.library.FilePolicy.class})
 public class XSLTFunctionsTest {
+    /**
+     * @bug 8165116
+     * Verifies that redirect works properly when extension function is enabled
+     *
+     * @param xml the XML source
+     * @param xsl the stylesheet that redirect output to a file
+     * @param output the output file
+     * @param redirect the redirect file
+     * @throws Exception if the test fails
+     **/
+    @Test(dataProvider = "redirect")
+    public void testRedirect(String xml, String xsl, String output, String redirect) throws Exception {
+
+        TransformerFactory tf = TransformerFactory.newInstance();
+        tf.setFeature(ORACLE_ENABLE_EXTENSION_FUNCTION, true);
+        Transformer t = tf.newTransformer(new StreamSource(new StringReader(xsl)));
+
+        //Transform the xml
+        t.transform(new StreamSource(new StringReader(xml)), new StreamResult(new StringWriter()));
+
+        // Verifies that the output is redirected successfully
+        String userDir = getSystemProperty("user.dir");
+        Path pathOutput = Paths.get(userDir, output);
+        Path pathRedirect = Paths.get(userDir, redirect);
+        Assert.assertTrue(Files.exists(pathOutput));
+        Assert.assertTrue(Files.exists(pathRedirect));
+        System.out.println("Output to " + pathOutput + " successful.");
+        System.out.println("Redirect to " + pathRedirect + " successful.");
+        Files.deleteIfExists(pathOutput);
+        Files.deleteIfExists(pathRedirect);
+    }
 
     /**
      * @bug 8161454
@@ -177,6 +211,13 @@
         };
     }
 
+    @DataProvider(name = "redirect")
+    public static Object[][] getData() {
+        return new Object[][] {
+            {documentTestXml, xslRedirect, "testoutput.xml", "testredirect.xml"},
+        };
+    }
+
     static final String documentTestXml = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><Test>Doc</Test>";
 
     static final String documentTestExternalDoc = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><Test>External Doc</Test>";
@@ -197,6 +238,23 @@
     static final String documentTesteExpectedResult = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
                                                     + "<root>[Test:Doc][Test:External Doc]</root>";
 
+    static String xslRedirect = " <xsl:stylesheet \n"
+            + "   xmlns:xsl=\"http://www.w3.org/1999/XSL/Transform\"\n"
+            + "   xmlns:xsltc=\"http://xml.apache.org/xalan/xsltc\"\n"
+            + "   xmlns:redirect=\"http://xml.apache.org/xalan/redirect\"\n"
+            + "   extension-element-prefixes=\"xsltc redirect\"\n"
+            + "   version=\"1.0\">\n"
+            + "   <xsl:template match=\"/\">\n"
+            + "     <xsl:text>This goes to standard output</xsl:text>\n"
+            + "     <xsltc:output file=\"testoutput.xml\">\n"
+            + "       <xsl:text>This ends up in the file 'testoutput.xml'</xsl:text>\n"
+            + "     </xsltc:output>\n"
+            + "     <redirect:write file=\"testredirect.xml\">\n"
+            + "       <xsl:text>This ends up in the file 'testredirect.xml'</xsl:text>\n"
+            + "     </redirect:write>\n"
+            + "   </xsl:template>\n"
+            + "</xsl:stylesheet>";
+
     public static final String ORACLE_JAXP_PROPERTY_PREFIX =
         "http://www.oracle.com/xml/jaxp/properties/";
     /**
--- a/jaxp/test/javax/xml/jaxp/unittest/transform/sax/Bug6451633.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/sax/Bug6451633.java	Fri Sep 16 13:15:02 2016 -0700
@@ -62,4 +62,3 @@
         Assert.assertEquals(0, ((Document) result.getNode()).getDocumentElement().getChildNodes().getLength());
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/transform/util/DOMUtil.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/util/DOMUtil.java	Fri Sep 16 13:15:02 2016 -0700
@@ -68,4 +68,3 @@
         Assert.assertTrue(version.equals(resultVersion), "Expected XML Version is 1.1, but actual version " + resultVersion);
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/transform/util/SAXUtil.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/util/SAXUtil.java	Fri Sep 16 13:15:02 2016 -0700
@@ -70,4 +70,3 @@
         Assert.assertTrue(encoding.equals(resultEncoding), "Expected XML Version is " + encoding + " , but actual  encoding " + resultEncoding);
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/transform/util/StAXUtil.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/util/StAXUtil.java	Fri Sep 16 13:15:02 2016 -0700
@@ -92,4 +92,3 @@
         ((StreamUtil) TransformerUtilFactory.getUtil(TransformerUtilFactory.STREAM)).checkStream(new FileInputStream(TEMP_FILE), version);
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/transform/util/StreamUtil.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/util/StreamUtil.java	Fri Sep 16 13:15:02 2016 -0700
@@ -94,4 +94,3 @@
         Assert.assertTrue(dh.getEncoding().equals(encoding), "Expected version is " + encoding + " actual version " + dh.getEncoding());
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/util/BOMInputStream.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/util/BOMInputStream.java	Fri Sep 16 13:15:02 2016 -0700
@@ -78,4 +78,3 @@
         }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/util/BaseStAXUT.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/util/BaseStAXUT.java	Fri Sep 16 13:15:02 2016 -0700
@@ -557,4 +557,3 @@
         System.err.println("Skipping " + clsName + "#" + method + ": entity expansion does not seem to be functioning properly" + msg + ".");
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/AnyElementTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/AnyElementTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -85,4 +85,3 @@
 
     private Validator validator;
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4966232.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4966232.java	Fri Sep 16 13:15:02 2016 -0700
@@ -75,4 +75,3 @@
         Assert.assertNotNull(s);
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4966254.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4966254.java	Fri Sep 16 13:15:02 2016 -0700
@@ -78,4 +78,3 @@
         return s;
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969042.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969042.java	Fri Sep 16 13:15:02 2016 -0700
@@ -111,4 +111,3 @@
         Assert.assertTrue(invoked[1], "Method characters() was not invoked.");
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969089.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969089.java	Fri Sep 16 13:15:02 2016 -0700
@@ -76,4 +76,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969110.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969110.java	Fri Sep 16 13:15:02 2016 -0700
@@ -79,4 +79,3 @@
         validatorHandler.setProperty(name, "123");
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969689.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969689.java	Fri Sep 16 13:15:02 2016 -0700
@@ -66,4 +66,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969692.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969692.java	Fri Sep 16 13:15:02 2016 -0700
@@ -67,4 +67,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969693.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969693.java	Fri Sep 16 13:15:02 2016 -0700
@@ -67,4 +67,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969695.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969695.java	Fri Sep 16 13:15:02 2016 -0700
@@ -65,4 +65,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969732.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969732.java	Fri Sep 16 13:15:02 2016 -0700
@@ -112,4 +112,3 @@
         parse(xmlReader, XML);
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4970380.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4970380.java	Fri Sep 16 13:15:02 2016 -0700
@@ -62,4 +62,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4970383.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4970383.java	Fri Sep 16 13:15:02 2016 -0700
@@ -53,4 +53,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4970400.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4970400.java	Fri Sep 16 13:15:02 2016 -0700
@@ -48,4 +48,3 @@
         validatorHandler.setFeature("http://xml.org/sax/features/namespace-prefixes", true);
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4970402.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4970402.java	Fri Sep 16 13:15:02 2016 -0700
@@ -123,4 +123,3 @@
         parse(xmlReader, XML);
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4970951.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4970951.java	Fri Sep 16 13:15:02 2016 -0700
@@ -126,4 +126,3 @@
         parse(xmlReader, XML);
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4971605.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4971605.java	Fri Sep 16 13:15:02 2016 -0700
@@ -66,4 +66,3 @@
         Assert.assertNotNull(schema, "Failed: newSchema returned null.");
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4971607.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4971607.java	Fri Sep 16 13:15:02 2016 -0700
@@ -56,4 +56,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4972882.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4972882.java	Fri Sep 16 13:15:02 2016 -0700
@@ -67,4 +67,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4986844.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4986844.java	Fri Sep 16 13:15:02 2016 -0700
@@ -56,4 +56,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4987574.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4987574.java	Fri Sep 16 13:15:02 2016 -0700
@@ -60,4 +60,3 @@
         schemaFactory.newSchema(tmpFile);
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4988267.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4988267.java	Fri Sep 16 13:15:02 2016 -0700
@@ -56,4 +56,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4988268.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4988268.java	Fri Sep 16 13:15:02 2016 -0700
@@ -46,4 +46,3 @@
         schemaFactory.newSchema(Bug4988268.class.getResource("Bug4988268.xsd"));
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4988387.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4988387.java	Fri Sep 16 13:15:02 2016 -0700
@@ -53,4 +53,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4996446.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4996446.java	Fri Sep 16 13:15:02 2016 -0700
@@ -90,4 +90,3 @@
         errorCounter++;
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4997818.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4997818.java	Fri Sep 16 13:15:02 2016 -0700
@@ -81,4 +81,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug5011500.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug5011500.java	Fri Sep 16 13:15:02 2016 -0700
@@ -108,4 +108,3 @@
         validator.validate(xmlSource);
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug5072946.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug5072946.java	Fri Sep 16 13:15:02 2016 -0700
@@ -125,4 +125,3 @@
         Assert.assertSame(r.getNode(), n);
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6378043.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6378043.java	Fri Sep 16 13:15:02 2016 -0700
@@ -53,4 +53,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6449797.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6449797.java	Fri Sep 16 13:15:02 2016 -0700
@@ -46,4 +46,3 @@
         SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI).newSchema(getClass().getResource("Bug6449797.xsd"));
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6457662.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6457662.java	Fri Sep 16 13:15:02 2016 -0700
@@ -86,4 +86,3 @@
         return rtn;
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6467424Test.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6467424Test.java	Fri Sep 16 13:15:02 2016 -0700
@@ -205,4 +205,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6483188.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6483188.java	Fri Sep 16 13:15:02 2016 -0700
@@ -88,4 +88,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6493687.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6493687.java	Fri Sep 16 13:15:02 2016 -0700
@@ -48,4 +48,3 @@
         System.out.println("Got here3");
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6509668.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6509668.java	Fri Sep 16 13:15:02 2016 -0700
@@ -141,4 +141,3 @@
         parse(xmlReader, XML);
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6526547.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6526547.java	Fri Sep 16 13:15:02 2016 -0700
@@ -82,4 +82,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6531160.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6531160.java	Fri Sep 16 13:15:02 2016 -0700
@@ -70,4 +70,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6695843Test.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6695843Test.java	Fri Sep 16 13:15:02 2016 -0700
@@ -82,4 +82,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084Test.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084Test.java	Fri Sep 16 13:15:02 2016 -0700
@@ -160,4 +160,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6859210.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6859210.java	Fri Sep 16 13:15:02 2016 -0700
@@ -100,4 +100,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6925531Test.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6925531Test.java	Fri Sep 16 13:15:02 2016 -0700
@@ -210,4 +210,3 @@
 
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6946312Test.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6946312Test.java	Fri Sep 16 13:15:02 2016 -0700
@@ -128,4 +128,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6954738_Test.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6954738_Test.java	Fri Sep 16 13:15:02 2016 -0700
@@ -83,4 +83,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/CR6708840Test.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/CR6708840Test.java	Fri Sep 16 13:15:02 2016 -0700
@@ -140,4 +140,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/CR6740048.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/CR6740048.java	Fri Sep 16 13:15:02 2016 -0700
@@ -131,4 +131,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/ErrorHandlerImpl.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/ErrorHandlerImpl.java	Fri Sep 16 13:15:02 2016 -0700
@@ -45,4 +45,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/Issue682Test.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Issue682Test.java	Fri Sep 16 13:15:02 2016 -0700
@@ -78,4 +78,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/IssueTracker30.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/IssueTracker30.java	Fri Sep 16 13:15:02 2016 -0700
@@ -132,4 +132,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/JaxpIssue43Test.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/JaxpIssue43Test.java	Fri Sep 16 13:15:02 2016 -0700
@@ -84,4 +84,3 @@
         return list.toArray(new Source[list.size()]);
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/JaxpIssue49.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/JaxpIssue49.java	Fri Sep 16 13:15:02 2016 -0700
@@ -94,4 +94,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/LargeMaxOccursTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/LargeMaxOccursTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -109,4 +109,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/MultiOccursTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/MultiOccursTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -147,4 +147,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/MultiOccursUnboundedTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/MultiOccursUnboundedTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -115,4 +115,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/OccursTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/OccursTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -147,4 +147,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/OccursUnboundedTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/OccursUnboundedTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -115,4 +115,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/OccursWildcardTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/OccursWildcardTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -147,4 +147,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/OccursWildcardUnbounded.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/OccursWildcardUnbounded.java	Fri Sep 16 13:15:02 2016 -0700
@@ -115,4 +115,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/ParticlesId005Test.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/ParticlesId005Test.java	Fri Sep 16 13:15:02 2016 -0700
@@ -99,4 +99,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/ParticlesIg004Test.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/ParticlesIg004Test.java	Fri Sep 16 13:15:02 2016 -0700
@@ -57,4 +57,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/ParticlesQ013Test.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/ParticlesQ013Test.java	Fri Sep 16 13:15:02 2016 -0700
@@ -98,4 +98,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/SchemaTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/SchemaTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -54,4 +54,3 @@
         factory.newSchema(new File(getClass().getResource("Bug8149915.xsd").getFile()));
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/TCKGroupA008Test.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/TCKGroupA008Test.java	Fri Sep 16 13:15:02 2016 -0700
@@ -60,4 +60,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/ValidatorTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/ValidatorTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -208,4 +208,3 @@
         return xmlr;
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/XMLDocBuilder.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/XMLDocBuilder.java	Fri Sep 16 13:15:02 2016 -0700
@@ -141,4 +141,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/XMLSchemaValidator.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/XMLSchemaValidator.java	Fri Sep 16 13:15:02 2016 -0700
@@ -59,4 +59,3 @@
         validator.validate(new DOMSource(node));
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252Test.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252Test.java	Fri Sep 16 13:15:02 2016 -0700
@@ -69,4 +69,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6963124Test.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6963124Test.java	Fri Sep 16 13:15:02 2016 -0700
@@ -61,4 +61,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6963468Test.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6963468Test.java	Fri Sep 16 13:15:02 2016 -0700
@@ -148,4 +148,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6964720Test.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6964720Test.java	Fri Sep 16 13:15:02 2016 -0700
@@ -58,4 +58,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6967214Test.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6967214Test.java	Fri Sep 16 13:15:02 2016 -0700
@@ -70,4 +70,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6970890Test.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6970890Test.java	Fri Sep 16 13:15:02 2016 -0700
@@ -72,4 +72,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6971190Test.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6971190Test.java	Fri Sep 16 13:15:02 2016 -0700
@@ -102,4 +102,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6974551Test.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6974551Test.java	Fri Sep 16 13:15:02 2016 -0700
@@ -122,4 +122,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6975265Test.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6975265Test.java	Fri Sep 16 13:15:02 2016 -0700
@@ -71,4 +71,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6977201Test.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6977201Test.java	Fri Sep 16 13:15:02 2016 -0700
@@ -71,4 +71,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6989956Test.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6989956Test.java	Fri Sep 16 13:15:02 2016 -0700
@@ -148,4 +148,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug7014246Test.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug7014246Test.java	Fri Sep 16 13:15:02 2016 -0700
@@ -59,4 +59,3 @@
     }
 
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/ParticleTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/ParticleTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -63,4 +63,3 @@
         validator.validate(new StreamSource(ParticleTest.class.getResourceAsStream("upa01.xml")));
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/RegexWord.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/RegexWord.java	Fri Sep 16 13:15:02 2016 -0700
@@ -63,4 +63,3 @@
         validator.validate(new StreamSource(RegexWord.class.getResourceAsStream("reZ003vExc23082309.xml")));
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/xpath/Bug4991857.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/xpath/Bug4991857.java	Fri Sep 16 13:15:02 2016 -0700
@@ -92,4 +92,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/xpath/Bug4991939.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/xpath/Bug4991939.java	Fri Sep 16 13:15:02 2016 -0700
@@ -61,4 +61,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/xpath/Bug4992788.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/xpath/Bug4992788.java	Fri Sep 16 13:15:02 2016 -0700
@@ -82,4 +82,3 @@
         return xpath;
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/xpath/Bug4992793.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/xpath/Bug4992793.java	Fri Sep 16 13:15:02 2016 -0700
@@ -83,4 +83,3 @@
         return xpath;
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/xpath/Bug4992805.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/xpath/Bug4992805.java	Fri Sep 16 13:15:02 2016 -0700
@@ -70,4 +70,3 @@
         return xpath;
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/xpath/ClassLoaderTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/xpath/ClassLoaderTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -54,4 +54,3 @@
 
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/xpath/MyClassLoader.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/xpath/MyClassLoader.java	Fri Sep 16 13:15:02 2016 -0700
@@ -47,4 +47,3 @@
         return isCalled;
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/xpath/SecureProcessingTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/xpath/SecureProcessingTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -196,4 +196,3 @@
         }
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/xpath/XPathAnyTypeTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/xpath/XPathAnyTypeTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -200,4 +200,3 @@
         verifyResult(result, "Customer");
     }
 }
-
--- a/jaxp/test/javax/xml/jaxp/unittest/xpath/XPathExpAnyTypeTest.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxp/test/javax/xml/jaxp/unittest/xpath/XPathExpAnyTypeTest.java	Fri Sep 16 13:15:02 2016 -0700
@@ -187,4 +187,3 @@
     }
 
 }
-
--- a/jaxws/.hgtags	Thu Sep 15 16:56:11 2016 -0400
+++ b/jaxws/.hgtags	Fri Sep 16 13:15:02 2016 -0700
@@ -380,3 +380,4 @@
 9fff2477a4cadf2a9618a76f1f4fe0f20bb5ff3b jdk-9+132
 05e99eefda2b58d1ed176e411302d9d6b35dca16 jdk-9+133
 ab1d78d395d4cb8be426ff181211da1a4085cf01 jdk-9+134
+22631824f55128a7ab6605493b3001a37af6a168 jdk-9+135
--- a/jdk/.hgtags	Thu Sep 15 16:56:11 2016 -0400
+++ b/jdk/.hgtags	Fri Sep 16 13:15:02 2016 -0700
@@ -378,3 +378,4 @@
 3cdae27c90b5e41afe75eab904fda19fac076330 jdk-9+133
 803adcd526d74ae0b64948d1f8260c2dbe514779 jdk-9+134
 021369229cfd0b5feb76834b2ea498f47f43c0f3 jdk-9+135
+54c5931849a33a363e03fdffa141503f5cc4779d jdk-9+136
--- a/jdk/make/gendata/GendataBreakIterator.gmk	Thu Sep 15 16:56:11 2016 -0400
+++ b/jdk/make/gendata/GendataBreakIterator.gmk	Fri Sep 16 13:15:02 2016 -0700
@@ -81,7 +81,7 @@
 
 # output
 BASE_DATA_PKG_DIR := $(JDK_OUTPUTDIR)/modules/java.base/sun/text/resources
-LD_DATA_PKG_DIR := $(JDK_OUTPUTDIR)/modules/jdk.localedata/sun/text/resources
+LD_DATA_PKG_DIR := $(JDK_OUTPUTDIR)/modules/jdk.localedata/sun/text/resources/ext
 BIFILES := $(BASE_DATA_PKG_DIR)/CharacterBreakIteratorData \
     $(BASE_DATA_PKG_DIR)/WordBreakIteratorData \
     $(BASE_DATA_PKG_DIR)/LineBreakIteratorData \
--- a/jdk/make/mapfiles/libattach/mapfile-linux	Thu Sep 15 16:56:11 2016 -0400
+++ b/jdk/make/mapfiles/libattach/mapfile-linux	Fri Sep 16 13:15:02 2016 -0700
@@ -30,8 +30,6 @@
 	    Java_sun_tools_attach_VirtualMachineImpl_checkPermissions;
 	    Java_sun_tools_attach_VirtualMachineImpl_close;
 	    Java_sun_tools_attach_VirtualMachineImpl_connect;
-	    Java_sun_tools_attach_VirtualMachineImpl_getLinuxThreadsManager;
-	    Java_sun_tools_attach_VirtualMachineImpl_isLinuxThreads;
 	    Java_sun_tools_attach_VirtualMachineImpl_open;
 	    Java_sun_tools_attach_VirtualMachineImpl_sendQuitTo;
             Java_sun_tools_attach_VirtualMachineImpl_sendQuitToChildrenOf;
--- a/jdk/src/java.base/aix/native/libnet/aix_close.c	Thu Sep 15 16:56:11 2016 -0400
+++ b/jdk/src/java.base/aix/native/libnet/aix_close.c	Fri Sep 16 13:15:02 2016 -0700
@@ -410,6 +410,10 @@
     BLOCKING_IO_RETURN_INT( s, recv(s, buf, len, 0) );
 }
 
+int NET_NonBlockingRead(int s, void* buf, size_t len) {
+    BLOCKING_IO_RETURN_INT(s, recv(s, buf, len, MSG_NONBLOCK));
+}
+
 int NET_ReadV(int s, const struct iovec * vector, int count) {
     BLOCKING_IO_RETURN_INT( s, readv(s, vector, count) );
 }
@@ -503,8 +507,8 @@
  * Auto restarts with adjusted timeout if interrupted by
  * signal other than our wakeup signal.
  */
-int NET_Timeout(int s, long timeout) {
-    long prevtime = 0, newtime;
+int NET_Timeout0(int s, long timeout, long currentTime) {
+    long prevtime = currentTime, newtime;
     struct timeval t;
     fdEntry_t *fdEntry = getFdEntry(s);
 
@@ -516,14 +520,6 @@
         return -1;
     }
 
-    /*
-     * Pick up current time as may need to adjust timeout
-     */
-    if (timeout > 0) {
-        gettimeofday(&t, NULL);
-        prevtime = t.tv_sec * 1000  +  t.tv_usec / 1000;
-    }
-
     for(;;) {
         struct pollfd pfd;
         int rv;
--- a/jdk/src/java.base/linux/native/libnet/linux_close.c	Thu Sep 15 16:56:11 2016 -0400
+++ b/jdk/src/java.base/linux/native/libnet/linux_close.c	Fri Sep 16 13:15:02 2016 -0700
@@ -367,6 +367,10 @@
     BLOCKING_IO_RETURN_INT( s, recv(s, buf, len, 0) );
 }
 
+int NET_NonBlockingRead(int s, void* buf, size_t len) {
+    BLOCKING_IO_RETURN_INT( s, recv(s, buf, len, MSG_DONTWAIT) );
+}
+
 int NET_ReadV(int s, const struct iovec * vector, int count) {
     BLOCKING_IO_RETURN_INT( s, readv(s, vector, count) );
 }
@@ -406,8 +410,8 @@
  * Auto restarts with adjusted timeout if interrupted by
  * signal other than our wakeup signal.
  */
-int NET_Timeout(int s, long timeout) {
-    long prevtime = 0, newtime;
+int NET_Timeout0(int s, long timeout, long currentTime) {
+    long prevtime = currentTime, newtime;
     struct timeval t;
     fdEntry_t *fdEntry = getFdEntry(s);
 
@@ -419,14 +423,6 @@
         return -1;
     }
 
-    /*
-     * Pick up current time as may need to adjust timeout
-     */
-    if (timeout > 0) {
-        gettimeofday(&t, NULL);
-        prevtime = t.tv_sec * 1000  +  t.tv_usec / 1000;
-    }
-
     for(;;) {
         struct pollfd pfd;
         int rv;
--- a/jdk/src/java.base/macosx/native/libnet/bsd_close.c	Thu Sep 15 16:56:11 2016 -0400
+++ b/jdk/src/java.base/macosx/native/libnet/bsd_close.c	Fri Sep 16 13:15:02 2016 -0700
@@ -371,6 +371,10 @@
     BLOCKING_IO_RETURN_INT( s, recv(s, buf, len, 0) );
 }
 
+int NET_NonBlockingRead(int s, void* buf, size_t len) {
+    BLOCKING_IO_RETURN_INT( s, recv(s, buf, len, MSG_DONTWAIT));
+}
+
 int NET_ReadV(int s, const struct iovec * vector, int count) {
     BLOCKING_IO_RETURN_INT( s, readv(s, vector, count) );
 }
@@ -410,8 +414,8 @@
  * Auto restarts with adjusted timeout if interrupted by
  * signal other than our wakeup signal.
  */
-int NET_Timeout(int s, long timeout) {
-    long prevtime = 0, newtime;
+int NET_Timeout0(int s, long timeout, long currentTime) {
+    long prevtime = currentTime, newtime;
     struct timeval t, *tp = &t;
     fd_set fds;
     fd_set* fdsp = NULL;
@@ -432,9 +436,6 @@
      */
     if (timeout > 0) {
         /* Timed */
-        struct timeval now;
-        gettimeofday(&now, NULL);
-        prevtime = now.tv_sec * 1000  +  now.tv_usec / 1000;
         t.tv_sec = timeout / 1000;
         t.tv_usec = (timeout % 1000) * 1000;
     } else if (timeout < 0) {
--- a/jdk/src/java.base/share/classes/java/lang/StringConcatHelper.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jdk/src/java.base/share/classes/java/lang/StringConcatHelper.java	Fri Sep 16 13:15:02 2016 -0700
@@ -334,11 +334,15 @@
     /**
      * Instantiates the String with given buffer and coder
      * @param buf     buffer to use
+     * @param index   remaining index
      * @param coder   coder to use
      * @return String resulting string
      */
-    static String newString(byte[] buf, byte coder) {
+    static String newString(byte[] buf, int index, byte coder) {
         // Use the private, non-copying constructor (unsafe!)
+        if (index != 0) {
+            throw new InternalError("Storage is not completely initialized, " + index + " bytes left");
+        }
         return new String(buf, coder);
     }
 
--- a/jdk/src/java.base/share/classes/java/lang/invoke/LambdaFormEditor.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jdk/src/java.base/share/classes/java/lang/invoke/LambdaFormEditor.java	Fri Sep 16 13:15:02 2016 -0700
@@ -83,7 +83,9 @@
                 FOLD_ARGS = 11,
                 FOLD_ARGS_TO_VOID = 12,
                 PERMUTE_ARGS = 13,
-                LOCAL_TYPES = 14;
+                LOCAL_TYPES = 14,
+                FOLD_SELECT_ARGS = 15,
+                FOLD_SELECT_ARGS_TO_VOID = 16;
 
         private static final boolean STRESS_TEST = false; // turn on to disable most packing
         private static final int
@@ -695,6 +697,72 @@
         return buf.endEdit();
     }
 
+    private LambdaForm makeArgumentCombinationForm(int pos,
+                                                   MethodType combinerType,
+                                                   int[] argPositions,
+                                                   boolean keepArguments,
+                                                   boolean dropResult) {
+        LambdaFormBuffer buf = buffer();
+        buf.startEdit();
+        int combinerArity = combinerType.parameterCount();
+        assert(combinerArity == argPositions.length);
+
+        int resultArity = (dropResult ? 0 : 1);
+
+        assert(pos <= lambdaForm.arity);
+        assert(pos > 0);  // cannot filter the MH arg itself
+        assert(combinerType == combinerType.basicType());
+        assert(combinerType.returnType() != void.class || dropResult);
+
+        BoundMethodHandle.SpeciesData oldData = oldSpeciesData();
+        BoundMethodHandle.SpeciesData newData = newSpeciesData(L_TYPE);
+
+        // The newly created LF will run with a different BMH.
+        // Switch over any pre-existing BMH field references to the new BMH class.
+        Name oldBaseAddress = lambdaForm.parameter(0);  // BMH holding the values
+        buf.replaceFunctions(oldData.getterFunctions(), newData.getterFunctions(), oldBaseAddress);
+        Name newBaseAddress = oldBaseAddress.withConstraint(newData);
+        buf.renameParameter(0, newBaseAddress);
+
+        Name getCombiner = new Name(newData.getterFunction(oldData.fieldCount()), newBaseAddress);
+        Object[] combinerArgs = new Object[1 + combinerArity];
+        combinerArgs[0] = getCombiner;
+        Name[] newParams;
+        if (keepArguments) {
+            newParams = new Name[0];
+            for (int i = 0; i < combinerArity; i++) {
+                combinerArgs[i + 1] = lambdaForm.parameter(1 + argPositions[i]);
+                assert (basicType(combinerType.parameterType(i)) == lambdaForm.parameterType(1 + argPositions[i]));
+            }
+        } else {
+            newParams = new Name[combinerArity];
+            for (int i = 0; i < newParams.length; i++) {
+                newParams[i] = lambdaForm.parameter(1 + argPositions[i]);
+                assert (basicType(combinerType.parameterType(i)) == lambdaForm.parameterType(1 + argPositions[i]));
+            }
+            System.arraycopy(newParams, 0,
+                             combinerArgs, 1, combinerArity);
+        }
+        Name callCombiner = new Name(combinerType, combinerArgs);
+
+        // insert the two new expressions
+        int exprPos = lambdaForm.arity();
+        buf.insertExpression(exprPos+0, getCombiner);
+        buf.insertExpression(exprPos+1, callCombiner);
+
+        // insert new arguments, if needed
+        int argPos = pos + resultArity;  // skip result parameter
+        for (Name newParam : newParams) {
+            buf.insertParameter(argPos++, newParam);
+        }
+        assert(buf.lastIndexOf(callCombiner) == exprPos+1+newParams.length);
+        if (!dropResult) {
+            buf.replaceParameterByCopy(pos, exprPos+1+newParams.length);
+        }
+
+        return buf.endEdit();
+    }
+
     LambdaForm filterReturnForm(BasicType newType, boolean constantZero) {
         byte kind = (constantZero ? Transform.FILTER_RETURN_TO_ZERO : Transform.FILTER_RETURN);
         Transform key = Transform.of(kind, newType.ordinal());
@@ -759,6 +827,21 @@
         return putInCache(key, form);
     }
 
+    LambdaForm foldArgumentsForm(int foldPos, boolean dropResult, MethodType combinerType, int ... argPositions) {
+        byte kind = (dropResult ? Transform.FOLD_SELECT_ARGS_TO_VOID
+                                : Transform.FOLD_SELECT_ARGS);
+        int[] keyArgs = Arrays.copyOf(argPositions, argPositions.length + 1);
+        keyArgs[argPositions.length] = foldPos;
+        Transform key = Transform.of(kind, keyArgs);
+        LambdaForm form = getInCache(key);
+        if (form != null) {
+            assert(form.arity == lambdaForm.arity - (kind == Transform.FOLD_SELECT_ARGS ? 1 : 0));
+            return form;
+        }
+        form = makeArgumentCombinationForm(foldPos, combinerType, argPositions, true, dropResult);
+        return putInCache(key, form);
+    }
+
     LambdaForm permuteArgumentsForm(int skip, int[] reorder) {
         assert(skip == 1);  // skip only the leading MH argument, names[0]
         int length = lambdaForm.names.length;
--- a/jdk/src/java.base/share/classes/java/lang/invoke/MethodHandles.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jdk/src/java.base/share/classes/java/lang/invoke/MethodHandles.java	Fri Sep 16 13:15:02 2016 -0700
@@ -3943,6 +3943,33 @@
         return rtype;
     }
 
+    private static Class<?> foldArgumentChecks(int foldPos, MethodType targetType, MethodType combinerType, int ... argPos) {
+        int foldArgs = combinerType.parameterCount();
+        if (argPos.length != foldArgs) {
+            throw newIllegalArgumentException("combiner and argument map must be equal size", combinerType, argPos.length);
+        }
+        Class<?> rtype = combinerType.returnType();
+        int foldVals = rtype == void.class ? 0 : 1;
+        boolean ok = true;
+        for (int i = 0; i < foldArgs; i++) {
+            int arg = argPos[i];
+            if (arg < 0 || arg > targetType.parameterCount()) {
+                throw newIllegalArgumentException("arg outside of target parameterRange", targetType, arg);
+            }
+            if (combinerType.parameterType(i) != targetType.parameterType(arg)) {
+                throw newIllegalArgumentException("target argument type at position " + arg
+                        + " must match combiner argument type at index " + i + ": " + targetType
+                        + " -> " + combinerType + ", map: " + Arrays.toString(argPos));
+            }
+        }
+        if (ok && foldVals != 0 && combinerType.returnType() != targetType.parameterType(foldPos)) {
+            ok = false;
+        }
+        if (!ok)
+            throw misMatchedTypes("target and combiner types", targetType, combinerType);
+        return rtype;
+    }
+
     /**
      * Makes a method handle which adapts a target method handle,
      * by guarding it with a test, a boolean-valued method handle.
@@ -4949,6 +4976,27 @@
         return result;
     }
 
+    /**
+     * As {@see foldArguments(MethodHandle, int, MethodHandle)}, but with the
+     * added capability of selecting the arguments from the targets parameters
+     * to call the combiner with. This allows us to avoid some simple cases of
+     * permutations and padding the combiner with dropArguments to select the
+     * right argument, which may ultimately produce fewer intermediaries.
+     */
+    static MethodHandle foldArguments(MethodHandle target, int pos, MethodHandle combiner, int ... argPositions) {
+        MethodType targetType = target.type();
+        MethodType combinerType = combiner.type();
+        Class<?> rtype = foldArgumentChecks(pos, targetType, combinerType, argPositions);
+        BoundMethodHandle result = target.rebind();
+        boolean dropResult = rtype == void.class;
+        LambdaForm lform = result.editor().foldArgumentsForm(1 + pos, dropResult, combinerType.basicType(), argPositions);
+        MethodType newType = targetType;
+        if (!dropResult) {
+            newType = newType.dropParameterTypes(pos, pos + 1);
+        }
+        result = result.copyWithExtendL(newType, lform, combiner);
+        return result;
+    }
 
     private static void checkLoop0(MethodHandle[][] clauses) {
         if (clauses == null || clauses.length == 0) {
--- a/jdk/src/java.base/share/classes/java/lang/invoke/StringConcatFactory.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jdk/src/java.base/share/classes/java/lang/invoke/StringConcatFactory.java	Fri Sep 16 13:15:02 2016 -0700
@@ -563,9 +563,8 @@
         }
 
         if ((lookup.lookupModes() & MethodHandles.Lookup.PRIVATE) == 0) {
-            throw new StringConcatException(String.format(
-                    "Invalid caller: %s",
-                    lookup.lookupClass().getName()));
+            throw new StringConcatException("Invalid caller: " +
+                    lookup.lookupClass().getName());
         }
 
         int cCount = 0;
@@ -1494,51 +1493,41 @@
             // Drop all remaining parameter types, leave only helper arguments:
             MethodHandle mh;
 
-            mh = MethodHandles.dropArguments(NEW_STRING, 2, ptypes);
-            mh = MethodHandles.dropArguments(mh, 0, int.class);
+            mh = MethodHandles.dropArguments(NEW_STRING, 3, ptypes);
 
-            // Safety: check that remaining index is zero -- that would mean the storage is completely
-            // overwritten, and no leakage of uninitialized data occurred.
-            mh = MethodHandles.filterArgument(mh, 0, CHECK_INDEX);
-
-            // Mix in prependers. This happens when (int, byte[], byte) = (index, storage, coder) is already
+            // Mix in prependers. This happens when (byte[], int, byte) = (storage, index, coder) is already
             // known from the combinators below. We are assembling the string backwards, so "index" is the
             // *ending* index.
             for (RecipeElement el : recipe.getElements()) {
-                MethodHandle prepender;
+                // Do the prepend, and put "new" index at index 1
+                mh = MethodHandles.dropArguments(mh, 2, int.class);
                 switch (el.getTag()) {
-                    case TAG_CONST:
+                    case TAG_CONST: {
                         Object cnst = el.getValue();
-                        prepender = MethodHandles.insertArguments(prepender(cnst.getClass()), 3, cnst);
+                        MethodHandle prepender = MethodHandles.insertArguments(prepender(cnst.getClass()), 3, cnst);
+                        mh = MethodHandles.foldArguments(mh, 1, prepender,
+                                2, 0, 3 // index, storage, coder
+                        );
                         break;
-                    case TAG_ARG:
+                    }
+                    case TAG_ARG: {
                         int pos = el.getArgPos();
-                        prepender = selectArgument(prepender(ptypes[pos]), 3, ptypes, pos);
+                        MethodHandle prepender = prepender(ptypes[pos]);
+                        mh = MethodHandles.foldArguments(mh, 1, prepender,
+                                2, 0, 3, // index, storage, coder
+                                4 + pos  // selected argument
+                        );
                         break;
+                    }
                     default:
                         throw new StringConcatException("Unhandled tag: " + el.getTag());
                 }
-
-                // Remove "old" index from arguments
-                mh = MethodHandles.dropArguments(mh, 1, int.class);
-
-                // Do the prepend, and put "new" index at index 0
-                mh = MethodHandles.foldArguments(mh, prepender);
             }
 
-            // Prepare the argument list for prepending. The tree below would instantiate
-            // the storage byte[] into argument 0, so we need to swap "storage" and "index".
-            // The index at this point equals to "size", and resides at argument 1.
-            {
-                MethodType nmt = mh.type()
-                        .changeParameterType(0, byte[].class)
-                        .changeParameterType(1, int.class);
-                mh = MethodHandles.permuteArguments(mh, nmt, swap10(nmt.parameterCount()));
-            }
-
-            // Fold in byte[] instantiation at argument 0.
-            MethodHandle combiner = MethodHandles.dropArguments(NEW_ARRAY, 2, ptypes);
-            mh = MethodHandles.foldArguments(mh, combiner);
+            // Fold in byte[] instantiation at argument 0
+            mh = MethodHandles.foldArguments(mh, 0, NEW_ARRAY,
+                    1, 2 // index, coder
+            );
 
             // Start combining length and coder mixers.
             //
@@ -1567,12 +1556,8 @@
                         int ac = el.getArgPos();
 
                         Class<?> argClass = ptypes[ac];
-                        MethodHandle lm = selectArgument(lengthMixer(argClass), 1, ptypes, ac);
-                        lm = MethodHandles.dropArguments(lm, 0, byte.class); // (*)
-                        lm = MethodHandles.dropArguments(lm, 2, byte.class);
-
-                        MethodHandle cm = selectArgument(coderMixer(argClass),  1, ptypes, ac);
-                        cm = MethodHandles.dropArguments(cm, 0, int.class);  // (**)
+                        MethodHandle lm = lengthMixer(argClass);
+                        MethodHandle cm = coderMixer(argClass);
 
                         // Read this bottom up:
 
@@ -1580,12 +1565,18 @@
                         mh = MethodHandles.dropArguments(mh, 2, int.class, byte.class);
 
                         // 3. Compute "new-index", producing ("new-index", "new-coder", "old-index", "old-coder", <args>)
-                        //    Length mixer ignores both "new-coder" and "old-coder" due to dropArguments above (*)
-                        mh = MethodHandles.foldArguments(mh, lm);
+                        //    Length mixer needs old index, plus the appropriate argument
+                        mh = MethodHandles.foldArguments(mh, 0, lm,
+                                2, // old-index
+                                4 + ac // selected argument
+                        );
 
                         // 2. Compute "new-coder", producing ("new-coder", "old-index", "old-coder", <args>)
-                        //    Coder mixer ignores the "old-index" arg due to dropArguments above (**)
-                        mh = MethodHandles.foldArguments(mh, cm);
+                        //    Coder mixer needs old coder, plus the appropriate argument.
+                        mh = MethodHandles.foldArguments(mh, 0, cm,
+                                2, // old-coder
+                                3 + ac // selected argument
+                        );
 
                         // 1. The mh shape here is ("old-index", "old-coder", <args>)
                         break;
@@ -1606,41 +1597,11 @@
             return mh;
         }
 
-        private static int[] swap10(int count) {
-            int[] perm = new int[count];
-            perm[0] = 1;
-            perm[1] = 0;
-            for (int i = 2; i < count; i++) {
-                perm[i] = i;
-            }
-            return perm;
-        }
-
-        // Adapts: (...prefix..., parameter[pos])R -> (...prefix..., ...parameters...)R
-        private static MethodHandle selectArgument(MethodHandle mh, int prefix, Class<?>[] ptypes, int pos) {
-            if (pos == 0) {
-                return MethodHandles.dropArguments(mh, prefix + 1, Arrays.copyOfRange(ptypes, 1, ptypes.length));
-            } else if (pos == ptypes.length - 1) {
-                return MethodHandles.dropArguments(mh, prefix, Arrays.copyOf(ptypes, ptypes.length - 1));
-            } else { // 0 < pos < ptypes.size() - 1
-                MethodHandle t = MethodHandles.dropArguments(mh, prefix, Arrays.copyOf(ptypes, pos));
-                return MethodHandles.dropArguments(t, prefix + 1 + pos, Arrays.copyOfRange(ptypes, pos + 1, ptypes.length));
-            }
-        }
-
         @ForceInline
         private static byte[] newArray(int length, byte coder) {
             return (byte[]) UNSAFE.allocateUninitializedArray(byte.class, length << coder);
         }
 
-        @ForceInline
-        private static int checkIndex(int index) {
-            if (index != 0) {
-                throw new IllegalStateException("Storage is not completely initialized, " + index + " bytes left");
-            }
-            return index;
-        }
-
         private static MethodHandle prepender(Class<?> cl) {
             return PREPENDERS.computeIfAbsent(cl, PREPEND);
         }
@@ -1678,7 +1639,6 @@
         };
 
         private static final MethodHandle NEW_STRING;
-        private static final MethodHandle CHECK_INDEX;
         private static final MethodHandle NEW_ARRAY;
         private static final ConcurrentMap<Class<?>, MethodHandle> PREPENDERS;
         private static final ConcurrentMap<Class<?>, MethodHandle> LENGTH_MIXERS;
@@ -1699,9 +1659,8 @@
             LENGTH_MIXERS = new ConcurrentHashMap<>();
             CODER_MIXERS = new ConcurrentHashMap<>();
 
-            NEW_STRING = lookupStatic(Lookup.IMPL_LOOKUP, STRING_HELPER, "newString", String.class, byte[].class, byte.class);
+            NEW_STRING = lookupStatic(Lookup.IMPL_LOOKUP, STRING_HELPER, "newString", String.class, byte[].class, int.class, byte.class);
             NEW_ARRAY  = lookupStatic(Lookup.IMPL_LOOKUP, MethodHandleInlineCopyStrategy.class, "newArray", byte[].class, int.class, byte.class);
-            CHECK_INDEX = lookupStatic(Lookup.IMPL_LOOKUP, MethodHandleInlineCopyStrategy.class, "checkIndex", int.class, int.class);
         }
     }
 
--- a/jdk/src/java.base/share/classes/java/util/ArrayDeque.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jdk/src/java.base/share/classes/java/util/ArrayDeque.java	Fri Sep 16 13:15:02 2016 -0700
@@ -81,8 +81,8 @@
  * Java Collections Framework</a>.
  *
  * @author  Josh Bloch and Doug Lea
+ * @param <E> the type of elements held in this deque
  * @since   1.6
- * @param <E> the type of elements held in this deque
  */
 public class ArrayDeque<E> extends AbstractCollection<E>
                            implements Deque<E>, Cloneable, Serializable
--- a/jdk/src/java.base/share/classes/java/util/PriorityQueue.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jdk/src/java.base/share/classes/java/util/PriorityQueue.java	Fri Sep 16 13:15:02 2016 -0700
@@ -749,11 +749,11 @@
     /**
      * Saves this queue to a stream (that is, serializes it).
      *
+     * @param s the stream
+     * @throws java.io.IOException if an I/O error occurs
      * @serialData The length of the array backing the instance is
      *             emitted (int), followed by all of its elements
      *             (each an {@code Object}) in the proper order.
-     * @param s the stream
-     * @throws java.io.IOException if an I/O error occurs
      */
     private void writeObject(java.io.ObjectOutputStream s)
         throws java.io.IOException {
--- a/jdk/src/java.base/share/classes/java/util/concurrent/CompletableFuture.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jdk/src/java.base/share/classes/java/util/concurrent/CompletableFuture.java	Fri Sep 16 13:15:02 2016 -0700
@@ -136,9 +136,9 @@
  * }}</pre>
  *
  * @author Doug Lea
- * @since 1.8
  * @param <T> The result type returned by this future's {@code join}
  * and {@code get} methods
+ * @since 1.8
  */
 public class CompletableFuture<T> implements Future<T>, CompletionStage<T> {
 
--- a/jdk/src/java.base/share/classes/java/util/concurrent/CountedCompleter.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jdk/src/java.base/share/classes/java/util/concurrent/CountedCompleter.java	Fri Sep 16 13:15:02 2016 -0700
@@ -120,102 +120,114 @@
  * to complete for some elements than others, either because of
  * intrinsic variation (for example I/O) or auxiliary effects such as
  * garbage collection.  Because CountedCompleters provide their own
- * continuations, other threads need not block waiting to perform
- * them.
+ * continuations, other tasks need not block waiting to perform them.
  *
- * <p>For example, here is an initial version of a class that uses
- * divide-by-two recursive decomposition to divide work into single
- * pieces (leaf tasks). Even when work is split into individual calls,
- * tree-based techniques are usually preferable to directly forking
- * leaf tasks, because they reduce inter-thread communication and
- * improve load balancing. In the recursive case, the second of each
- * pair of subtasks to finish triggers completion of its parent
+ * <p>For example, here is an initial version of a utility method that
+ * uses divide-by-two recursive decomposition to divide work into
+ * single pieces (leaf tasks). Even when work is split into individual
+ * calls, tree-based techniques are usually preferable to directly
+ * forking leaf tasks, because they reduce inter-thread communication
+ * and improve load balancing. In the recursive case, the second of
+ * each pair of subtasks to finish triggers completion of their parent
  * (because no result combination is performed, the default no-op
  * implementation of method {@code onCompletion} is not overridden).
- * A static utility method sets up the base task and invokes it
- * (here, implicitly using the {@link ForkJoinPool#commonPool()}).
+ * The utility method sets up the root task and invokes it (here,
+ * implicitly using the {@link ForkJoinPool#commonPool()}).  It is
+ * straightforward and reliable (but not optimal) to always set the
+ * pending count to the number of child tasks and call {@code
+ * tryComplete()} immediately before returning.
  *
  * <pre> {@code
- * class MyOperation<E> { void apply(E e) { ... }  }
+ * public static <E> void forEach(E[] array, Consumer<E> action) {
+ *   class Task extends CountedCompleter<Void> {
+ *     final int lo, hi;
+ *     Task(Task parent, int lo, int hi) {
+ *       super(parent); this.lo = lo; this.hi = hi;
+ *     }
  *
- * class ForEach<E> extends CountedCompleter<Void> {
- *
- *   public static <E> void forEach(E[] array, MyOperation<E> op) {
- *     new ForEach<E>(null, array, op, 0, array.length).invoke();
+ *     public void compute() {
+ *       if (hi - lo >= 2) {
+ *         int mid = (lo + hi) >>> 1;
+ *         // must set pending count before fork
+ *         setPendingCount(2);
+ *         new Task(this, mid, hi).fork(); // right child
+ *         new Task(this, lo, mid).fork(); // left child
+ *       }
+ *       else if (hi > lo)
+ *         action.accept(array[lo]);
+ *       tryComplete();
+ *     }
  *   }
- *
- *   final E[] array; final MyOperation<E> op; final int lo, hi;
- *   ForEach(CountedCompleter<?> p, E[] array, MyOperation<E> op, int lo, int hi) {
- *     super(p);
- *     this.array = array; this.op = op; this.lo = lo; this.hi = hi;
- *   }
- *
- *   public void compute() { // version 1
- *     if (hi - lo >= 2) {
- *       int mid = (lo + hi) >>> 1;
- *       setPendingCount(2); // must set pending count before fork
- *       new ForEach(this, array, op, mid, hi).fork(); // right child
- *       new ForEach(this, array, op, lo, mid).fork(); // left child
- *     }
- *     else if (hi > lo)
- *       op.apply(array[lo]);
- *     tryComplete();
- *   }
+ *   new Task(null, 0, array.length).invoke();
  * }}</pre>
  *
  * This design can be improved by noticing that in the recursive case,
  * the task has nothing to do after forking its right task, so can
  * directly invoke its left task before returning. (This is an analog
- * of tail recursion removal.)  Also, because the task returns upon
- * executing its left task (rather than falling through to invoke
- * {@code tryComplete}) the pending count is set to one:
+ * of tail recursion removal.)  Also, when the last action in a task
+ * is to fork or invoke a subtask (a "tail call"), the call to {@code
+ * tryComplete()} can be optimized away, at the cost of making the
+ * pending count look "off by one".
  *
  * <pre> {@code
- * class ForEach<E> ... {
- *   ...
- *   public void compute() { // version 2
- *     if (hi - lo >= 2) {
- *       int mid = (lo + hi) >>> 1;
- *       setPendingCount(1); // only one pending
- *       new ForEach(this, array, op, mid, hi).fork(); // right child
- *       new ForEach(this, array, op, lo, mid).compute(); // direct invoke
+ *     public void compute() {
+ *       if (hi - lo >= 2) {
+ *         int mid = (lo + hi) >>> 1;
+ *         setPendingCount(1); // looks off by one, but correct!
+ *         new Task(this, mid, hi).fork(); // right child
+ *         new Task(this, lo, mid).compute(); // direct invoke
+ *       } else {
+ *         if (hi > lo)
+ *           action.accept(array[lo]);
+ *         tryComplete();
+ *       }
+ *     }}</pre>
+ *
+ * As a further optimization, notice that the left task need not even exist.
+ * Instead of creating a new one, we can continue using the original task,
+ * and add a pending count for each fork.  Additionally, because no task
+ * in this tree implements an {@link #onCompletion(CountedCompleter)} method,
+ * {@code tryComplete} can be replaced with {@link #propagateCompletion}.
+ *
+ * <pre> {@code
+ *     public void compute() {
+ *       int n = hi - lo;
+ *       for (; n >= 2; n /= 2) {
+ *         addToPendingCount(1);
+ *         new Task(this, lo + n/2, lo + n).fork();
+ *       }
+ *       if (n > 0)
+ *         action.accept(array[lo]);
+ *       propagateCompletion();
+ *     }}</pre>
+ *
+ * When pending counts can be precomputed, they can be established in
+ * the constructor:
+ *
+ * <pre> {@code
+ * public static <E> void forEach(E[] array, Consumer<E> action) {
+ *   class Task extends CountedCompleter<Void> {
+ *     final int lo, hi;
+ *     Task(Task parent, int lo, int hi) {
+ *       super(parent, 31 - Integer.numberOfLeadingZeros(hi - lo));
+ *       this.lo = lo; this.hi = hi;
  *     }
- *     else {
- *       if (hi > lo)
- *         op.apply(array[lo]);
- *       tryComplete();
+ *
+ *     public void compute() {
+ *       for (int n = hi - lo; n >= 2; n /= 2)
+ *         new Task(this, lo + n/2, lo + n).fork();
+ *       action.accept(array[lo]);
+ *       propagateCompletion();
  *     }
  *   }
+ *   if (array.length > 0)
+ *     new Task(null, 0, array.length).invoke();
  * }}</pre>
  *
- * As a further optimization, notice that the left task need not even exist.
- * Instead of creating a new one, we can iterate using the original task,
- * and add a pending count for each fork.  Additionally, because no task
- * in this tree implements an {@link #onCompletion(CountedCompleter)} method,
- * {@code tryComplete()} can be replaced with {@link #propagateCompletion}.
- *
- * <pre> {@code
- * class ForEach<E> ... {
- *   ...
- *   public void compute() { // version 3
- *     int l = lo, h = hi;
- *     while (h - l >= 2) {
- *       int mid = (l + h) >>> 1;
- *       addToPendingCount(1);
- *       new ForEach(this, array, op, mid, h).fork(); // right child
- *       h = mid;
- *     }
- *     if (h > l)
- *       op.apply(array[l]);
- *     propagateCompletion();
- *   }
- * }}</pre>
- *
- * Additional optimizations of such classes might entail precomputing
- * pending counts so that they can be established in constructors,
- * specializing classes for leaf steps, subdividing by say, four,
- * instead of two per iteration, and using an adaptive threshold
- * instead of always subdividing down to single elements.
+ * Additional optimizations of such classes might entail specializing
+ * classes for leaf steps, subdividing by say, four, instead of two
+ * per iteration, and using an adaptive threshold instead of always
+ * subdividing down to single elements.
  *
  * <p><b>Searching.</b> A tree of CountedCompleters can search for a
  * value or property in different parts of a data structure, and
--- a/jdk/src/java.base/share/classes/java/util/concurrent/CyclicBarrier.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jdk/src/java.base/share/classes/java/util/concurrent/CyclicBarrier.java	Fri Sep 16 13:15:02 2016 -0700
@@ -132,10 +132,10 @@
  * <i>happen-before</i> actions following a successful return from the
  * corresponding {@code await()} in other threads.
  *
- * @since 1.5
  * @see CountDownLatch
  *
  * @author Doug Lea
+ * @since 1.5
  */
 public class CyclicBarrier {
     /**
--- a/jdk/src/java.base/share/classes/java/util/concurrent/Flow.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jdk/src/java.base/share/classes/java/util/concurrent/Flow.java	Fri Sep 16 13:15:02 2016 -0700
@@ -68,7 +68,7 @@
  *   private boolean subscribed; // true after first subscribe
  *   public synchronized void subscribe(Subscriber<? super Boolean> subscriber) {
  *     if (subscribed)
- *        subscriber.onError(new IllegalStateException()); // only one allowed
+ *       subscriber.onError(new IllegalStateException()); // only one allowed
  *     else {
  *       subscribed = true;
  *       subscriber.onSubscribe(new OneShotSubscription(subscriber, executor));
--- a/jdk/src/java.base/share/classes/java/util/concurrent/ForkJoinPool.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jdk/src/java.base/share/classes/java/util/concurrent/ForkJoinPool.java	Fri Sep 16 13:15:02 2016 -0700
@@ -130,7 +130,7 @@
  * </table>
  *
  * <p>The common pool is by default constructed with default
- * parameters, but these may be controlled by setting three
+ * parameters, but these may be controlled by setting the following
  * {@linkplain System#getProperty system properties}:
  * <ul>
  * <li>{@code java.util.concurrent.ForkJoinPool.common.parallelism}
@@ -3241,7 +3241,7 @@
          * An ACC to restrict permissions for the factory itself.
          * The constructed workers have no permissions set.
          */
-        private static final AccessControlContext innocuousAcc;
+        private static final AccessControlContext INNOCUOUS_ACC;
         static {
             Permissions innocuousPerms = new Permissions();
             innocuousPerms.add(modifyThreadPermission);
@@ -3249,7 +3249,7 @@
                                    "enableContextClassLoaderOverride"));
             innocuousPerms.add(new RuntimePermission(
                                    "modifyThreadGroup"));
-            innocuousAcc = new AccessControlContext(new ProtectionDomain[] {
+            INNOCUOUS_ACC = new AccessControlContext(new ProtectionDomain[] {
                     new ProtectionDomain(null, innocuousPerms)
                 });
         }
@@ -3260,7 +3260,7 @@
                     public ForkJoinWorkerThread run() {
                         return new ForkJoinWorkerThread.
                             InnocuousForkJoinWorkerThread(pool);
-                    }}, innocuousAcc);
+                    }}, INNOCUOUS_ACC);
         }
     }
 
--- a/jdk/src/java.base/share/classes/java/util/concurrent/Semaphore.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jdk/src/java.base/share/classes/java/util/concurrent/Semaphore.java	Fri Sep 16 13:15:02 2016 -0700
@@ -72,8 +72,8 @@
  *   protected synchronized Object getNextAvailableItem() {
  *     for (int i = 0; i < MAX_AVAILABLE; ++i) {
  *       if (!used[i]) {
- *          used[i] = true;
- *          return items[i];
+ *         used[i] = true;
+ *         return items[i];
  *       }
  *     }
  *     return null; // not reached
@@ -82,11 +82,11 @@
  *   protected synchronized boolean markAsUnused(Object item) {
  *     for (int i = 0; i < MAX_AVAILABLE; ++i) {
  *       if (item == items[i]) {
- *          if (used[i]) {
- *            used[i] = false;
- *            return true;
- *          } else
- *            return false;
+ *         if (used[i]) {
+ *           used[i] = false;
+ *           return true;
+ *         } else
+ *           return false;
  *       }
  *     }
  *     return false;
--- a/jdk/src/java.base/share/classes/java/util/concurrent/SubmissionPublisher.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jdk/src/java.base/share/classes/java/util/concurrent/SubmissionPublisher.java	Fri Sep 16 13:15:02 2016 -0700
@@ -554,8 +554,9 @@
                 while (r != null) {
                     BufferedSubscription<T> nextRetry = r.nextRetry;
                     r.nextRetry = null;
-                    int stat = (nanos > 0L) ? r.timedOffer(item, nanos) :
-                        r.offer(item);
+                    int stat = (nanos > 0L)
+                        ? r.timedOffer(item, nanos)
+                        : r.offer(item);
                     if (stat == 0 && onDrop != null &&
                         onDrop.test(r.subscriber, item))
                         stat = r.offer(item);
--- a/jdk/src/java.base/share/classes/java/util/concurrent/ThreadPoolExecutor.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jdk/src/java.base/share/classes/java/util/concurrent/ThreadPoolExecutor.java	Fri Sep 16 13:15:02 2016 -0700
@@ -617,6 +617,9 @@
         /** Per-thread task counter */
         volatile long completedTasks;
 
+        // TODO: switch to AbstractQueuedLongSynchronizer and move
+        // completedTasks into the lock word.
+
         /**
          * Creates with given first task and thread from ThreadFactory.
          * @param firstTask the first task (null if none)
--- a/jdk/src/java.base/share/classes/java/util/concurrent/atomic/AtomicInteger.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jdk/src/java.base/share/classes/java/util/concurrent/atomic/AtomicInteger.java	Fri Sep 16 13:15:02 2016 -0700
@@ -193,7 +193,7 @@
 
     /**
      * Atomically increments the current value,
-     * with memory effects as specified by {@link VarHandle#addAndGet}.
+     * with memory effects as specified by {@link VarHandle#getAndAdd}.
      *
      * <p>Equivalent to {@code addAndGet(1)}.
      *
@@ -205,7 +205,7 @@
 
     /**
      * Atomically decrements the current value,
-     * with memory effects as specified by {@link VarHandle#addAndGet}.
+     * with memory effects as specified by {@link VarHandle#getAndAdd}.
      *
      * <p>Equivalent to {@code addAndGet(-1)}.
      *
--- a/jdk/src/java.base/share/classes/java/util/concurrent/locks/StampedLock.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jdk/src/java.base/share/classes/java/util/concurrent/locks/StampedLock.java	Fri Sep 16 13:15:02 2016 -0700
@@ -154,13 +154,13 @@
  *     long stamp = sl.tryOptimisticRead();
  *     double currentX = x, currentY = y;
  *     if (!sl.validate(stamp)) {
- *        stamp = sl.readLock();
- *        try {
- *          currentX = x;
- *          currentY = y;
- *        } finally {
- *           sl.unlockRead(stamp);
- *        }
+ *       stamp = sl.readLock();
+ *       try {
+ *         currentX = x;
+ *         currentY = y;
+ *       } finally {
+ *         sl.unlockRead(stamp);
+ *       }
  *     }
  *     return Math.sqrt(currentX * currentX + currentY * currentY);
  *   }
--- a/jdk/src/java.base/share/classes/java/util/jar/JarFile.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jdk/src/java.base/share/classes/java/util/jar/JarFile.java	Fri Sep 16 13:15:02 2016 -0700
@@ -536,19 +536,6 @@
      * @return an ordered {@code Stream} of entries in this jar file
      * @throws IllegalStateException if the jar file has been closed
      * @since 1.8
-     *
-     * @apiNote  A versioned view of the stream obtained from a {@code JarFile}
-     * configured to process a multi-release jar file can be created with code
-     * similar to the following:
-     * <pre>
-     * {@code
-     *     Stream<JarEntry> versionedStream(JarFile jf) {
-     *         return jf.stream().map(JarEntry::getName)
-     *                  .filter(name -> !name.startsWith("META-INF/versions/"))
-     *                  .map(jf::getJarEntry);
-     *     }
-     * }
-     * </pre>
      */
     public Stream<JarEntry> stream() {
         return StreamSupport.stream(Spliterators.spliterator(
@@ -571,7 +558,7 @@
 
     private ZipEntry getVersionedEntry(ZipEntry ze) {
         ZipEntry vze = null;
-        if (BASE_VERSION_MAJOR < versionMajor && !ze.isDirectory()) {
+        if (BASE_VERSION_MAJOR < versionMajor) {
             String name = ze.getName();
             if (!name.startsWith(META_INF)) {
                 vze = searchForVersionedEntry(versionMajor, name);
@@ -836,18 +823,25 @@
     private static final byte[] CLASSPATH_CHARS =
             {'C','L','A','S','S','-','P','A','T','H', ':', ' '};
 
-    // The bad character shift for "class-path:"
+    // The bad character shift for "class-path: "
     private static final byte[] CLASSPATH_LASTOCC;
 
+    // The good suffix shift for "class-path: "
+    private static final byte[] CLASSPATH_OPTOSFT;
+
     private static final byte[] MULTIRELEASE_CHARS =
             {'M','U','L','T','I','-','R','E','L','E', 'A', 'S', 'E', ':',
                     ' ', 'T', 'R', 'U', 'E'};
 
-    // The bad character shift for "multi-release: "
+    // The bad character shift for "multi-release: true"
     private static final byte[] MULTIRELEASE_LASTOCC;
 
+    // The good suffix shift for "multi-release: true"
+    private static final byte[] MULTIRELEASE_OPTOSFT;
+
     static {
         CLASSPATH_LASTOCC = new byte[64];
+        CLASSPATH_OPTOSFT = new byte[12];
         CLASSPATH_LASTOCC[(int)'C' - 32] = 1;
         CLASSPATH_LASTOCC[(int)'L' - 32] = 2;
         CLASSPATH_LASTOCC[(int)'S' - 32] = 5;
@@ -858,8 +852,13 @@
         CLASSPATH_LASTOCC[(int)'H' - 32] = 10;
         CLASSPATH_LASTOCC[(int)':' - 32] = 11;
         CLASSPATH_LASTOCC[(int)' ' - 32] = 12;
+        for (int i = 0; i < 11; i++) {
+            CLASSPATH_OPTOSFT[i] = 12;
+        }
+        CLASSPATH_OPTOSFT[11] = 1;
 
         MULTIRELEASE_LASTOCC = new byte[64];
+        MULTIRELEASE_OPTOSFT = new byte[19];
         MULTIRELEASE_LASTOCC[(int)'M' - 32] = 1;
         MULTIRELEASE_LASTOCC[(int)'I' - 32] = 5;
         MULTIRELEASE_LASTOCC[(int)'-' - 32] = 6;
@@ -872,6 +871,11 @@
         MULTIRELEASE_LASTOCC[(int)'R' - 32] = 17;
         MULTIRELEASE_LASTOCC[(int)'U' - 32] = 18;
         MULTIRELEASE_LASTOCC[(int)'E' - 32] = 19;
+        for (int i = 0; i < 17; i++) {
+            MULTIRELEASE_OPTOSFT[i] = 19;
+        }
+        MULTIRELEASE_OPTOSFT[17] = 6;
+        MULTIRELEASE_OPTOSFT[18] = 1;
     }
 
     private JarEntry getManEntry() {
@@ -913,7 +917,7 @@
      * Since there are no repeated substring in our search strings,
      * the good suffix shifts can be replaced with a comparison.
      */
-    private int match(byte[] src, byte[] b, byte[] lastOcc) {
+    private int match(byte[] src, byte[] b, byte[] lastOcc, byte[] optoSft) {
         int len = src.length;
         int last = b.length - len;
         int i = 0;
@@ -926,9 +930,8 @@
 
                     if (c != src[j]) {
                         // no match
-                        int goodShift = (j < len - 1) ? len : 1;
                         int badShift = lastOcc[c - 32];
-                        i += Math.max(j + 1 - badShift, goodShift);
+                        i += Math.max(j + 1 - badShift, optoSft[j]);
                         continue next;
                     }
                 } else {
@@ -958,10 +961,11 @@
             if (manEntry != null) {
                 byte[] b = getBytes(manEntry);
                 hasClassPathAttribute = match(CLASSPATH_CHARS, b,
-                        CLASSPATH_LASTOCC) != -1;
+                        CLASSPATH_LASTOCC, CLASSPATH_OPTOSFT) != -1;
                 // is this a multi-release jar file
                 if (MULTI_RELEASE_ENABLED) {
-                    int i = match(MULTIRELEASE_CHARS, b, MULTIRELEASE_LASTOCC);
+                    int i = match(MULTIRELEASE_CHARS, b, MULTIRELEASE_LASTOCC,
+                            MULTIRELEASE_OPTOSFT);
                     if (i != -1) {
                         i += MULTIRELEASE_CHARS.length;
                         if (i < b.length) {
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/java.base/share/classes/jdk/internal/util/jar/VersionedStream.java	Fri Sep 16 13:15:02 2016 -0700
@@ -0,0 +1,85 @@
+/*
+ * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.internal.util.jar;
+
+import java.util.Objects;
+import java.util.jar.JarEntry;
+import java.util.jar.JarFile;
+import java.util.stream.Stream;
+
+public class VersionedStream {
+    private static final String META_INF_VERSIONS = "META-INF/versions/";
+
+    /**
+     * Returns a stream of versioned entries, derived from the base names of
+     * all entries in a multi-release {@code JarFile} that are present either in
+     * the base directory or in any versioned directory with a version number
+     * less than or equal to the {@code Runtime.Version::major} that the
+     * {@code JarFile} was opened with.  These versioned entries are aliases
+     * for the real entries -- i.e. the names are base names and the content
+     * may come from a versioned directory entry.  If the {@code jarFile} is not
+     * a multi-release jar, a stream of all entries is returned.
+     *
+     * @param jf the input JarFile
+     * @return stream of entries
+     * @since 9
+     */
+    public static Stream<JarEntry> stream(JarFile jf) {
+        if (jf.isMultiRelease()) {
+            int version = jf.getVersion().major();
+            return jf.stream()
+                    .map(je -> getBaseSuffix(je, version))
+                    .filter(Objects::nonNull)
+                    .distinct()
+                    .map(jf::getJarEntry);
+        }
+        return jf.stream();
+    }
+
+    private static String getBaseSuffix(JarEntry je, int version) {
+        String name = je.getName();
+        if (name.startsWith(META_INF_VERSIONS)) {
+            int len = META_INF_VERSIONS.length();
+            int index = name.indexOf('/', len);
+            if (index == -1 || index == (name.length() - 1)) {
+                // filter out META-INF/versions/* and META-INF/versions/*/
+                return null;
+            }
+            try {
+                if (Integer.parseInt(name, len, index, 10) > version) {
+                    // not an integer
+                    return null;
+                }
+            } catch (NumberFormatException x) {
+                // silently remove malformed entries
+                return null;
+            }
+            // We know name looks like META-INF/versions/*/*
+            return name.substring(index + 1);
+        }
+        return name;
+    }
+}
--- a/jdk/src/java.base/share/classes/module-info.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jdk/src/java.base/share/classes/module-info.java	Fri Sep 16 13:15:02 2016 -0700
@@ -143,7 +143,8 @@
     exports jdk.internal.org.objectweb.asm.signature to
         jdk.scripting.nashorn;
     exports jdk.internal.loader to
-        java.instrument;
+        java.instrument,
+        java.logging;
     exports jdk.internal.math to
         java.desktop;
     exports jdk.internal.module to
--- a/jdk/src/java.base/share/classes/sun/net/www/protocol/jar/JarURLConnection.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jdk/src/java.base/share/classes/sun/net/www/protocol/jar/JarURLConnection.java	Fri Sep 16 13:15:02 2016 -0700
@@ -125,7 +125,9 @@
              * to get the jarFile, and set it as our permission.
              */
             if (getUseCaches()) {
+                boolean oldUseCaches = jarFileURLConnection.getUseCaches();
                 jarFileURLConnection = factory.getConnection(jarFile);
+                jarFileURLConnection.setUseCaches(oldUseCaches);
             }
 
             if ((entryName != null)) {
--- a/jdk/src/java.base/share/classes/sun/security/provider/certpath/OCSP.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jdk/src/java.base/share/classes/sun/security/provider/certpath/OCSP.java	Fri Sep 16 13:15:02 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -125,7 +125,7 @@
                 ("Exception while encoding OCSPRequest", e);
         }
         OCSPResponse ocspResponse = check(Collections.singletonList(certId),
-            responderURI, issuerCert, null, null,
+            responderURI, new OCSPResponse.IssuerInfo(issuerCert), null, null,
             Collections.<Extension>emptyList());
         return (RevocationStatus)ocspResponse.getSingleResponse(certId);
     }
@@ -173,7 +173,8 @@
                 ("Exception while encoding OCSPRequest", e);
         }
         OCSPResponse ocspResponse = check(Collections.singletonList(certId),
-            responderURI, issuerCert, responderCert, date, extensions);
+            responderURI, new OCSPResponse.IssuerInfo(issuerCert),
+            responderCert, date, extensions);
         return (RevocationStatus) ocspResponse.getSingleResponse(certId);
     }
 
@@ -182,7 +183,7 @@
      *
      * @param certIds the CertIds to be checked
      * @param responderURI the URI of the OCSP responder
-     * @param issuerCert the issuer's certificate
+     * @param issuerInfo the issuer's certificate and/or subject and public key
      * @param responderCert the OCSP responder's certificate
      * @param date the time the validity of the OCSP responder's certificate
      *    should be checked against. If null, the current time is used.
@@ -195,8 +196,8 @@
      * @throws CertPathValidatorException if an exception occurs while
      *    encoding the OCSP Request or validating the OCSP Response
      */
-    static OCSPResponse check(List<CertId> certIds, URI responderURI,
-                              X509Certificate issuerCert,
+        static OCSPResponse check(List<CertId> certIds, URI responderURI,
+                              OCSPResponse.IssuerInfo issuerInfo,
                               X509Certificate responderCert, Date date,
                               List<Extension> extensions)
         throws IOException, CertPathValidatorException
@@ -214,7 +215,7 @@
             ocspResponse = new OCSPResponse(response);
 
             // verify the response
-            ocspResponse.verify(certIds, issuerCert, responderCert, date,
+            ocspResponse.verify(certIds, issuerInfo, responderCert, date,
                     nonce);
         } catch (IOException ioe) {
             throw new CertPathValidatorException(
--- a/jdk/src/java.base/share/classes/sun/security/provider/certpath/OCSPResponse.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jdk/src/java.base/share/classes/sun/security/provider/certpath/OCSPResponse.java	Fri Sep 16 13:15:02 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -41,6 +41,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 import javax.security.auth.x500.X500Principal;
 
@@ -373,8 +374,8 @@
         }
     }
 
-    void verify(List<CertId> certIds, X509Certificate issuerCert,
-                X509Certificate responderCert, Date date, byte[] nonce)
+    void verify(List<CertId> certIds, IssuerInfo issuerInfo,
+            X509Certificate responderCert, Date date, byte[] nonce)
         throws CertPathValidatorException
     {
         switch (responseStatus) {
@@ -414,7 +415,9 @@
             // Add the Issuing CA cert and/or Trusted Responder cert to the list
             // of certs from the OCSP response
             try {
-                certs.add(X509CertImpl.toImpl(issuerCert));
+                if (issuerInfo.getCertificate() != null) {
+                    certs.add(X509CertImpl.toImpl(issuerInfo.getCertificate()));
+                }
                 if (responderCert != null) {
                     certs.add(X509CertImpl.toImpl(responderCert));
                 }
@@ -464,7 +467,10 @@
         // Check whether the signer cert returned by the responder is trusted
         if (signerCert != null) {
             // Check if the response is signed by the issuing CA
-            if (signerCert.equals(issuerCert)) {
+            if (signerCert.getSubjectX500Principal().equals(
+                    issuerInfo.getName()) &&
+                    signerCert.getPublicKey().equals(
+                            issuerInfo.getPublicKey())) {
                 if (debug != null) {
                     debug.println("OCSP response is signed by the target's " +
                         "Issuing CA");
@@ -481,7 +487,7 @@
 
             // Check if the response is signed by an authorized responder
             } else if (signerCert.getIssuerX500Principal().equals(
-                       issuerCert.getSubjectX500Principal())) {
+                    issuerInfo.getName())) {
 
                 // Check for the OCSPSigning key purpose
                 try {
@@ -502,7 +508,8 @@
                 // Check algorithm constraints specified in security property
                 // "jdk.certpath.disabledAlgorithms".
                 AlgorithmChecker algChecker = new AlgorithmChecker(
-                                    new TrustAnchor(issuerCert, null));
+                        new TrustAnchor(issuerInfo.getName(),
+                                issuerInfo.getPublicKey(), null));
                 algChecker.init(false);
                 algChecker.check(signerCert, Collections.<String>emptySet());
 
@@ -540,7 +547,7 @@
 
                 // verify the signature
                 try {
-                    signerCert.verify(issuerCert.getPublicKey());
+                    signerCert.verify(issuerInfo.getPublicKey());
                     if (debug != null) {
                         debug.println("OCSP response is signed by an " +
                             "Authorized Responder");
@@ -971,4 +978,86 @@
             return sb.toString();
         }
     }
+
+    /**
+     * Helper class that allows consumers to pass in issuer information.  This
+     * will always consist of the issuer's name and public key, but may also
+     * contain a certificate if the originating data is in that form.
+     */
+    static final class IssuerInfo {
+        private final X509Certificate certificate;
+        private final X500Principal name;
+        private final PublicKey pubKey;
+
+        IssuerInfo(X509Certificate issuerCert) {
+            certificate = Objects.requireNonNull(issuerCert,
+                    "Constructor requires non-null certificate");
+            name = certificate.getSubjectX500Principal();
+            pubKey = certificate.getPublicKey();
+        }
+
+        IssuerInfo(X500Principal subjectName, PublicKey key) {
+            certificate = null;
+            name = Objects.requireNonNull(subjectName,
+                    "Constructor requires non-null subject");
+            pubKey = Objects.requireNonNull(key,
+                    "Constructor requires non-null public key");
+        }
+
+        IssuerInfo(TrustAnchor anchor) {
+            certificate = anchor.getTrustedCert();
+            if (certificate != null) {
+                name = certificate.getSubjectX500Principal();
+                pubKey = certificate.getPublicKey();
+            } else {
+                name = anchor.getCA();
+                pubKey = anchor.getCAPublicKey();
+            }
+        }
+
+        /**
+         * Get the certificate in this IssuerInfo if present.
+         *
+         * @return the {@code X509Certificate} used to create this IssuerInfo
+         * object, or {@code null} if a certificate was not used in its
+         * creation.
+         */
+        X509Certificate getCertificate() {
+            return certificate;
+        }
+
+        /**
+         * Get the name of this issuer.
+         *
+         * @return an {@code X500Principal} corresponding to this issuer's
+         * name.  If derived from an issuer's {@code X509Certificate} this
+         * would be equivalent to the certificate subject name.
+         */
+        X500Principal getName() {
+            return name;
+        }
+
+        /**
+         * Get the public key for this issuer.
+         *
+         * @return a {@code PublicKey} for this issuer.
+         */
+        PublicKey getPublicKey() {
+            return pubKey;
+        }
+
+        /**
+         * Create a string representation of this IssuerInfo.
+         *
+         * @return a {@code String} form of this IssuerInfo object.
+         */
+        @Override
+        public String toString() {
+            StringBuilder sb = new StringBuilder();
+            sb.append("Issuer Info:\n");
+            sb.append("Name: ").append(name.toString()).append("\n");
+            sb.append("Public Key:\n").append(pubKey.toString()).append("\n");
+            return sb.toString();
+        }
+    }
 }
--- a/jdk/src/java.base/share/classes/sun/security/provider/certpath/RevocationChecker.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jdk/src/java.base/share/classes/sun/security/provider/certpath/RevocationChecker.java	Fri Sep 16 13:15:02 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -61,12 +61,12 @@
     private List<CertStore> certStores;
     private Map<X509Certificate, byte[]> ocspResponses;
     private List<Extension> ocspExtensions;
-    private boolean legacy;
+    private final boolean legacy;
     private LinkedList<CertPathValidatorException> softFailExceptions =
         new LinkedList<>();
 
     // state variables
-    private X509Certificate issuerCert;
+    private OCSPResponse.IssuerInfo issuerInfo;
     private PublicKey prevPubKey;
     private boolean crlSignFlag;
     private int certIndex;
@@ -301,9 +301,9 @@
                 CertPathValidatorException("forward checking not supported");
         }
         if (anchor != null) {
-            issuerCert = anchor.getTrustedCert();
-            prevPubKey = (issuerCert != null) ? issuerCert.getPublicKey()
-                                              : anchor.getCAPublicKey();
+            issuerInfo = new OCSPResponse.IssuerInfo(anchor);
+            prevPubKey = issuerInfo.getPublicKey();
+
         }
         crlSignFlag = true;
         if (params != null && params.certPath() != null) {
@@ -437,7 +437,7 @@
     private void updateState(X509Certificate cert)
         throws CertPathValidatorException
     {
-        issuerCert = cert;
+        issuerInfo = new OCSPResponse.IssuerInfo(cert);
 
         // Make new public key if parameters are missing
         PublicKey pubKey = cert.getPublicKey();
@@ -708,14 +708,8 @@
         OCSPResponse response = null;
         CertId certId = null;
         try {
-            if (issuerCert != null) {
-                certId = new CertId(issuerCert,
-                                    currCert.getSerialNumberObject());
-            } else {
-                // must be an anchor name and key
-                certId = new CertId(anchor.getCA(), anchor.getCAPublicKey(),
-                                    currCert.getSerialNumberObject());
-            }
+            certId = new CertId(issuerInfo.getName(), issuerInfo.getPublicKey(),
+                    currCert.getSerialNumberObject());
 
             // check if there is a cached OCSP response available
             byte[] responseBytes = ocspResponses.get(cert);
@@ -732,8 +726,8 @@
                         nonce = ext.getValue();
                     }
                 }
-                response.verify(Collections.singletonList(certId), issuerCert,
-                                responderCert, params.date(), nonce);
+                response.verify(Collections.singletonList(certId), issuerInfo,
+                        responderCert, params.date(), nonce);
 
             } else {
                 URI responderURI = (this.responderURI != null)
@@ -746,8 +740,8 @@
                 }
 
                 response = OCSP.check(Collections.singletonList(certId),
-                                      responderURI, issuerCert, responderCert,
-                                      null, ocspExtensions);
+                                      responderURI, issuerInfo,
+                                      responderCert, null, ocspExtensions);
             }
         } catch (IOException e) {
             throw new CertPathValidatorException(
--- a/jdk/src/java.base/share/classes/sun/text/resources/BreakIteratorRulesProvider.java	Thu Sep 15 16:56:11 2016 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package sun.text.resources;
-
-import java.util.spi.ResourceBundleProvider;
-
-/**
- * An interface for the internal locale data provider for which {@code ResourceBundle}
- * searches.
- */
-public interface BreakIteratorRulesProvider extends ResourceBundleProvider {
-}
--- a/jdk/src/java.base/share/classes/sun/util/locale/provider/BreakDictionary.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jdk/src/java.base/share/classes/sun/util/locale/provider/BreakDictionary.java	Fri Sep 16 13:15:02 2016 -0700
@@ -149,7 +149,10 @@
         BufferedInputStream in;
         try {
             PrivilegedExceptionAction<BufferedInputStream> pa = () -> {
-                InputStream is = module.getResourceAsStream("sun/text/resources/" + dictionaryName);
+                String pathName = "jdk.localedata".equals(module.getName()) ?
+                     "sun/text/resources/ext/" :
+                     "sun/text/resources/";
+                InputStream is = module.getResourceAsStream(pathName + dictionaryName);
                 if (is == null) {
                     // Try to load the file with "java.base" module instance. Assumption
                     // here is that the fall back data files to be read should reside in
--- a/jdk/src/java.base/share/classes/sun/util/locale/provider/RuleBasedBreakIterator.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jdk/src/java.base/share/classes/sun/util/locale/provider/RuleBasedBreakIterator.java	Fri Sep 16 13:15:02 2016 -0700
@@ -444,7 +444,10 @@
         BufferedInputStream is;
         try {
             PrivilegedExceptionAction<BufferedInputStream> pa = () -> {
-                InputStream in = module.getResourceAsStream("sun/text/resources/" + datafile);
+                String pathName = "jdk.localedata".equals(module.getName()) ?
+                     "sun/text/resources/ext/" :
+                     "sun/text/resources/";
+                InputStream in = module.getResourceAsStream(pathName + datafile);
                 if (in == null) {
                     // Try to load the file with "java.base" module instance. Assumption
                     // here is that the fall back data files to be read should reside in
--- a/jdk/src/java.base/share/native/libjli/java.h	Thu Sep 15 16:56:11 2016 -0400
+++ b/jdk/src/java.base/share/native/libjli/java.h	Fri Sep 16 13:15:02 2016 -0700
@@ -112,6 +112,9 @@
 jboolean
 GetApplicationHome(char *buf, jint bufsize);
 
+jboolean
+GetApplicationHomeFromDll(char *buf, jint bufsize);
+
 #define GetArch() GetArchPath(CURRENT_DATA_MODEL)
 
 /*
--- a/jdk/src/java.base/solaris/native/libnet/solaris_close.c	Thu Sep 15 16:56:11 2016 -0400
+++ b/jdk/src/java.base/solaris/native/libnet/solaris_close.c	Fri Sep 16 13:15:02 2016 -0700
@@ -35,7 +35,7 @@
     if (1) {                                          \
         do {                                          \
             _result = _cmd;                           \
-        } while((_result == -1) && (errno == EINTR)); \
+        } while((_result == -1) && (errno == EINTR));      \
         return _result;                               \
     }                                                 \
 } while(0)
@@ -44,6 +44,10 @@
     RESTARTABLE_RETURN_INT(recv(s, buf, len, 0));
 }
 
+int NET_NonBlockingRead(int s, void* buf, size_t len) {
+    RESTARTABLE_RETURN_INT(recv(s, buf, len, MSG_DONTWAIT));
+}
+
 int NET_RecvFrom(int s, void *buf, int len, unsigned int flags,
                  struct sockaddr *from, socklen_t *fromlen) {
     RESTARTABLE_RETURN_INT(recvfrom(s, buf, len, flags, from, fromlen));
@@ -86,19 +90,14 @@
     RESTARTABLE_RETURN_INT(poll(ufds, nfds, timeout));
 }
 
-int NET_Timeout(int s, long timeout) {
+int NET_Timeout0(int s, long timeout, long currentTime) {
     int result;
     struct timeval t;
-    long prevtime, newtime;
+    long prevtime = currentTime, newtime;
     struct pollfd pfd;
     pfd.fd = s;
     pfd.events = POLLIN;
 
-    if (timeout > 0) {
-        gettimeofday(&t, NULL);
-        prevtime = (t.tv_sec * 1000)  +  t.tv_usec / 1000;
-    }
-
     for(;;) {
         result = poll(&pfd, 1, timeout);
         if (result < 0 && errno == EINTR) {
--- a/jdk/src/java.base/unix/native/libjava/TimeZone_md.c	Thu Sep 15 16:56:11 2016 -0400
+++ b/jdk/src/java.base/unix/native/libjava/TimeZone_md.c	Fri Sep 16 13:15:02 2016 -0700
@@ -128,13 +128,20 @@
     char *dbuf = NULL;
     char *tz = NULL;
     int res;
+    long name_max = 0;
 
     dirp = opendir(dir);
     if (dirp == NULL) {
         return NULL;
     }
 
-    entry = (struct dirent64 *) malloc((size_t) pathconf(dir, _PC_NAME_MAX));
+    name_max = pathconf(dir, _PC_NAME_MAX);
+    // If pathconf did not work, fall back to a mimimum buffer size.
+    if (name_max < 1024) {
+        name_max = 1024;
+    }
+
+    entry = (struct dirent64 *)malloc(offsetof(struct dirent64, d_name) + name_max + 1);
     if (entry == NULL) {
         (void) closedir(dirp);
         return NULL;
--- a/jdk/src/java.base/unix/native/libjli/java_md_common.c	Thu Sep 15 16:56:11 2016 -0400
+++ b/jdk/src/java.base/unix/native/libjli/java_md_common.c	Fri Sep 16 13:15:02 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,8 +25,49 @@
 #include "java.h"
 
 /*
- * If app is "/foo/bin/javac", or "/foo/bin/sparcv9/javac" then put
- * "/foo" into buf.
+ * Find the last occurrence of a string
+ */
+char* findLastPathComponent(char *buffer, const char *comp) {
+    char* t = buffer;
+    char* p = NULL;
+    size_t l = JLI_StrLen(comp);
+    t = JLI_StrStr(t, comp);
+
+    while (t != NULL) {
+        p = t;
+        t += l;
+        t = JLI_StrStr(t, comp);
+    }
+    return p;
+}
+
+/*
+ * Removes the trailing file name and any intermediate platform
+ * directories, if any, and its enclosing directory.
+ * Ex: if a buffer contains "/foo/bin/javac" or "/foo/bin/x64/javac", the
+ * truncated resulting buffer will contain "/foo".
+ */
+jboolean
+TruncatePath(char *buf)
+{
+    // try bin directory, maybe an executable
+    char *p = findLastPathComponent(buf, "/bin/");
+    if (p != NULL) {
+        *p = '\0';
+        return JNI_TRUE;
+    }
+    // try lib directory, maybe a library
+    p = findLastPathComponent(buf, "/lib/");
+    if (p != NULL) {
+        *p = '\0';
+        return JNI_TRUE;
+    }
+    return JNI_FALSE;
+}
+
+/*
+ * Retrieves the path to the JRE home by locating the executable file
+ * of the current process and then truncating the path to the executable
  */
 jboolean
 GetApplicationHome(char *buf, jint bufsize)
@@ -38,26 +79,27 @@
     } else {
         return JNI_FALSE;
     }
+    return TruncatePath(buf);
+}
 
-    if (JLI_StrRChr(buf, '/') == 0) {
-        buf[0] = '\0';
-        return JNI_FALSE;
+/*
+ * Retrieves the path to the JRE home by locating the
+ * shared library and then truncating the path to it.
+ */
+jboolean
+GetApplicationHomeFromDll(char *buf, jint bufsize)
+{
+    /* try to find ourselves instead */
+    Dl_info info;
+    if (dladdr((void*)&GetApplicationHomeFromDll, &info) != 0) {
+        char *path = realpath(info.dli_fname, buf);
+        if (path == buf) {
+            return TruncatePath(buf);
+        }
     }
-    *(JLI_StrRChr(buf, '/')) = '\0';    /* executable file      */
-    if (JLI_StrLen(buf) < 4 || JLI_StrRChr(buf, '/') == 0) {
-        buf[0] = '\0';
-        return JNI_FALSE;
-    }
-    if (JLI_StrCmp("/bin", buf + JLI_StrLen(buf) - 4) != 0)
-        *(JLI_StrRChr(buf, '/')) = '\0';        /* sparcv9 or amd64     */
-    if (JLI_StrLen(buf) < 4 || JLI_StrCmp("/bin", buf + JLI_StrLen(buf) - 4) != 0) {
-        buf[0] = '\0';
-        return JNI_FALSE;
-    }
-    *(JLI_StrRChr(buf, '/')) = '\0';    /* bin                  */
+    return JNI_FALSE;
+}
 
-    return JNI_TRUE;
-}
 /*
  * Return true if the named program exists
  */
--- a/jdk/src/java.base/unix/native/libjli/java_md_solinux.c	Thu Sep 15 16:56:11 2016 -0400
+++ b/jdk/src/java.base/unix/native/libjli/java_md_solinux.c	Fri Sep 16 13:15:02 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -666,6 +666,7 @@
 GetJREPath(char *path, jint pathsize, const char * arch, jboolean speculative)
 {
     char libjava[MAXPATHLEN];
+    struct stat s;
 
     if (GetApplicationHome(path, pathsize)) {
         /* Is JRE co-located with the application? */
@@ -688,6 +689,14 @@
         }
     }
 
+    if (GetApplicationHomeFromDll(path, pathsize)) {
+        JLI_Snprintf(libjava, sizeof(libjava), "%s/lib/%s/" JAVA_DLL, path, arch);
+        if (stat(libjava, &s) == 0) {
+            JLI_TraceLauncher("JRE path is %s\n", path);
+            return JNI_TRUE;
+        }
+    }
+
     if (!speculative)
       JLI_ReportErrorMessage(JRE_ERROR8 JAVA_DLL);
     return JNI_FALSE;
--- a/jdk/src/java.base/unix/native/libnet/SocketInputStream.c	Thu Sep 15 16:56:11 2016 -0400
+++ b/jdk/src/java.base/unix/native/libnet/SocketInputStream.c	Fri Sep 16 13:15:02 2016 -0700
@@ -35,7 +35,6 @@
 
 #include "java_net_SocketInputStream.h"
 
-
 /************************************************************************
  * SocketInputStream
  */
@@ -52,6 +51,40 @@
     IO_fd_fdID = NET_GetFileDescriptorID(env);
 }
 
+static int NET_ReadWithTimeout(JNIEnv *env, int fd, char *bufP, int len, long timeout) {
+    int result = 0;
+    long prevtime = NET_GetCurrentTime(), newtime;
+    while (timeout > 0) {
+        result = NET_TimeoutWithCurrentTime(fd, timeout, prevtime);
+        if (result <= 0) {
+            if (result == 0) {
+                JNU_ThrowByName(env, JNU_JAVANETPKG "SocketTimeoutException", "Read timed out");
+            } else if (result == -1) {
+                if (errno == EBADF) {
+                    JNU_ThrowByName(env, JNU_JAVANETPKG "SocketException", "Socket closed");
+                } else if (errno == ENOMEM) {
+                    JNU_ThrowOutOfMemoryError(env, "NET_Timeout native heap allocation failed");
+                } else {
+                    JNU_ThrowByNameWithMessageAndLastError
+                            (env, JNU_JAVANETPKG "SocketException", "select/poll failed");
+                }
+            }
+            return -1;
+        }
+        result = NET_NonBlockingRead(fd, bufP, len);
+        if (result == -1 && ((errno == EAGAIN) || (errno == EWOULDBLOCK))) {
+            newtime = NET_GetCurrentTime();
+            timeout -= newtime - prevtime;
+            if (timeout > 0) {
+                prevtime = newtime;
+            }
+        } else {
+            break;
+        }
+    }
+    return result;
+}
+
 /*
  * Class:     java_net_SocketInputStream
  * Method:    socketRead0
@@ -98,32 +131,18 @@
     } else {
         bufP = BUF;
     }
-
     if (timeout) {
-        nread = NET_Timeout(fd, timeout);
-        if (nread <= 0) {
-            if (nread == 0) {
-                JNU_ThrowByName(env, JNU_JAVANETPKG "SocketTimeoutException",
-                            "Read timed out");
-            } else if (nread == -1) {
-                if (errno == EBADF) {
-                     JNU_ThrowByName(env, JNU_JAVANETPKG "SocketException", "Socket closed");
-                } else if (errno == ENOMEM) {
-                    JNU_ThrowOutOfMemoryError(env, "NET_Timeout native heap allocation failed");
-                } else {
-                    JNU_ThrowByNameWithMessageAndLastError
-                        (env, JNU_JAVANETPKG "SocketException", "select/poll failed");
-                }
-            }
+        nread = NET_ReadWithTimeout(env, fd, bufP, len, timeout);
+        if ((*env)->ExceptionCheck(env)) {
             if (bufP != BUF) {
                 free(bufP);
             }
-            return -1;
+            return nread;
         }
+    } else {
+        nread = NET_Read(fd, bufP, len);
     }
 
-    nread = NET_Read(fd, bufP, len);
-
     if (nread <= 0) {
         if (nread < 0) {
 
@@ -143,7 +162,6 @@
                      JNU_ThrowByName(env, JNU_JAVAIOPKG "InterruptedIOException",
                            "Operation interrupted");
                      break;
-
                 default:
                     JNU_ThrowByNameWithMessageAndLastError
                         (env, JNU_JAVANETPKG "SocketException", "Read failed");
--- a/jdk/src/java.base/unix/native/libnet/net_util_md.c	Thu Sep 15 16:56:11 2016 -0400
+++ b/jdk/src/java.base/unix/native/libnet/net_util_md.c	Fri Sep 16 13:15:02 2016 -0700
@@ -33,6 +33,7 @@
 #include <netdb.h>
 #include <stdlib.h>
 #include <dlfcn.h>
+#include <sys/time.h>
 
 #ifndef _ALLBSD_SOURCE
 #include <values.h>
@@ -1669,3 +1670,18 @@
 
     return timeout;
 }
+
+long NET_GetCurrentTime() {
+    struct timeval time;
+    gettimeofday(&time, NULL);
+    return (time.tv_sec * 1000 + time.tv_usec / 1000);
+}
+
+int NET_TimeoutWithCurrentTime(int s, long timeout, long currentTime) {
+    return NET_Timeout0(s, timeout, currentTime);
+}
+
+int NET_Timeout(int s, long timeout) {
+    long currentTime = (timeout > 0) ? NET_GetCurrentTime() : 0;
+    return NET_Timeout0(s, timeout, currentTime);
+}
--- a/jdk/src/java.base/unix/native/libnet/net_util_md.h	Thu Sep 15 16:56:11 2016 -0400
+++ b/jdk/src/java.base/unix/native/libnet/net_util_md.h	Fri Sep 16 13:15:02 2016 -0700
@@ -35,7 +35,11 @@
 #include <sys/poll.h>
 
 int NET_Timeout(int s, long timeout);
+int NET_Timeout0(int s, long timeout, long currentTime);
 int NET_Read(int s, void* buf, size_t len);
+int NET_NonBlockingRead(int s, void* buf, size_t len);
+int NET_TimeoutWithCurrentTime(int s, long timeout, long currentTime);
+long NET_GetCurrentTime();
 int NET_RecvFrom(int s, void *buf, int len, unsigned int flags,
                  struct sockaddr *from, socklen_t *fromlen);
 int NET_ReadV(int s, const struct iovec * vector, int count);
--- a/jdk/src/java.base/windows/native/libjli/java_md.c	Thu Sep 15 16:56:11 2016 -0400
+++ b/jdk/src/java.base/windows/native/libjli/java_md.c	Fri Sep 16 13:15:02 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -348,7 +348,6 @@
 
     JLI_ReportErrorMessage(JRE_ERROR8 JAVA_DLL);
     return JNI_FALSE;
-
 }
 
 /*
@@ -423,11 +422,11 @@
     *JLI_StrRChr(buf, '\\') = '\0'; /* remove .exe file name */
     if ((cp = JLI_StrRChr(buf, '\\')) == 0) {
         /* This happens if the application is in a drive root, and
-        * there is no bin directory. */
+         * there is no bin directory. */
         buf[0] = '\0';
         return JNI_FALSE;
     }
-    *cp = '\0';  /* remove the bin\ part */
+    *cp = '\0'; /* remove the bin\ part */
     return JNI_TRUE;
 }
 
@@ -449,16 +448,16 @@
 jboolean
 GetApplicationHomeFromDll(char *buf, jint bufsize)
 {
-    HMODULE hModule;
-    DWORD dwFlags =
-        GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS |
-        GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT;
+    HMODULE module;
+    DWORD flags = GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS |
+                  GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT;
 
-    if (GetModuleHandleEx(dwFlags, (LPCSTR)&GetJREPath, &hModule) == 0) {
-        return JNI_FALSE;
-    };
-    GetModuleFileName(hModule, buf, bufsize);
-    return TruncatePath(buf);
+    if (GetModuleHandleEx(flags, (LPCSTR)&GetJREPath, &module) != 0) {
+        if (GetModuleFileName(module, buf, bufsize) != 0) {
+            return TruncatePath(buf);
+        }
+    }
+    return JNI_FALSE;
 }
 
 /*
--- a/jdk/src/java.base/windows/native/libjli/java_md.h	Thu Sep 15 16:56:11 2016 -0400
+++ b/jdk/src/java.base/windows/native/libjli/java_md.h	Fri Sep 16 13:15:02 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -54,7 +54,4 @@
 
 int UnsetEnv(char *name);
 
-jboolean
-GetApplicationHomeFromDll(char *buf, jint bufsize);
-
 #endif /* JAVA_MD_H */
--- a/jdk/src/java.instrument/share/classes/java/lang/instrument/package.html	Thu Sep 15 16:56:11 2016 -0400
+++ b/jdk/src/java.instrument/share/classes/java/lang/instrument/package.html	Fri Sep 16 13:15:02 2016 -0700
@@ -105,6 +105,10 @@
 The agent class will be loaded by the system class loader
 (see {@link java.lang.ClassLoader#getSystemClassLoader ClassLoader.getSystemClassLoader}). This is
 the class loader which typically loads the class containing the application <code>main</code> method.
+The system class loader must support a mechanism to add an agent JAR file to the system class path.
+If it is a custom system class loader then it must define the
+<code>appendToClassPathForInstrumentation</code> method as specified in
+{@link Instrumentation#appendToSystemClassLoaderSearch appendToSystemClassLoaderSearch}.
 The <code>premain</code> methods will be run under the same security and classloader 
 rules as the application <code>main</code> method.
 There are no modeling restrictions on what the agent <code>premain</code> method may do.
@@ -140,7 +144,10 @@
 
   <li><p>The system class loader (
       {@link java.lang.ClassLoader#getSystemClassLoader ClassLoader.getSystemClassLoader}) must
-      support a mechanism to add an agent JAR file to the system class path.</li>
+      support a mechanism to add an agent JAR file to the system class path.
+      If it is a custom system class loader then it must define the
+      <code>appendToClassPathForInstrumentation</code> method as specified in
+      {@link Instrumentation#appendToSystemClassLoaderSearch appendToSystemClassLoaderSearch}.</li>
 </ol>  
 
 <P>
--- a/jdk/src/java.instrument/share/native/libinstrument/InvocationAdapter.c	Thu Sep 15 16:56:11 2016 -0400
+++ b/jdk/src/java.instrument/share/native/libinstrument/InvocationAdapter.c	Fri Sep 16 13:15:02 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -190,10 +190,8 @@
             return JNI_ERR;
         }
 
-        /*
-         * Add to the jarfile
-         */
-        appendClassPath(agent, jarfile);
+        /* Save the jarfile name */
+        agent->mJarfile = jarfile;
 
         /*
          * The value of the Premain-Class attribute becomes the agent
@@ -241,7 +239,6 @@
         /*
          * Clean-up
          */
-        free(jarfile);
         if (options != NULL) free(options);
         freeAttributes(attributes);
         free(premainClass);
@@ -459,7 +456,23 @@
 
     /* process the premain calls on the all the JPL agents */
     if ( environment != NULL ) {
-        jthrowable outstandingException = preserveThrowable(jnienv);
+        jthrowable outstandingException = NULL;
+        /*
+         * Add the jarfile to the system class path
+         */
+        JPLISAgent * agent = environment->mAgent;
+        if (appendClassPath(agent, agent->mJarfile)) {
+            fprintf(stderr, "Unable to add %s to system class path - "
+                    "the system class loader does not define the "
+                    "appendToClassPathForInstrumentation method or the method failed\n",
+                    agent->mJarfile);
+            free((void *)agent->mJarfile);
+            abortJVM(jnienv, JPLIS_ERRORMESSAGE_CANNOTSTART);
+        }
+        free((void *)agent->mJarfile);
+        agent->mJarfile = NULL;
+
+        outstandingException = preserveThrowable(jnienv);
         success = processJavaStart( environment->mAgent,
                                     jnienv);
         restoreThrowable(jnienv, outstandingException);
@@ -631,32 +644,19 @@
     jvmtierr = (*jvmtienv)->AddToSystemClassLoaderSearch(jvmtienv, jarfile);
     check_phase_ret_1(jvmtierr);
 
-    if (jvmtierr == JVMTI_ERROR_NONE) {
-        return 0;
-    } else {
-        jvmtiPhase phase;
-        jvmtiError err;
-
-        err = (*jvmtienv)->GetPhase(jvmtienv, &phase);
-        /* can be called from any phase */
-        jplis_assert(err == JVMTI_ERROR_NONE);
-
-        if (phase == JVMTI_PHASE_LIVE) {
-            switch (jvmtierr) {
-                case JVMTI_ERROR_CLASS_LOADER_UNSUPPORTED :
-                    fprintf(stderr, "System class loader does not support adding "
-                        "JAR file to system class path during the live phase!\n");
-                        break;
-                default:
-                    fprintf(stderr, "Unexpected error (%d) returned by "
-                        "AddToSystemClassLoaderSearch\n", jvmtierr);
-                    break;
-            }
-            return -1;
-        }
-        jplis_assert(0);
+    switch (jvmtierr) {
+        case JVMTI_ERROR_NONE :
+            return 0;
+        case JVMTI_ERROR_CLASS_LOADER_UNSUPPORTED :
+            fprintf(stderr, "System class loader does not define "
+                "the appendToClassPathForInstrumentation method\n");
+            break;
+        default:
+            fprintf(stderr, "Unexpected error (%d) returned by "
+                "AddToSystemClassLoaderSearch\n", jvmtierr);
+            break;
     }
-    return -2;
+    return -1;
 }
 
 
--- a/jdk/src/java.instrument/share/native/libinstrument/JPLISAgent.c	Thu Sep 15 16:56:11 2016 -0400
+++ b/jdk/src/java.instrument/share/native/libinstrument/JPLISAgent.c	Fri Sep 16 13:15:02 2016 -0700
@@ -272,6 +272,7 @@
     agent->mNativeMethodPrefixAdded                  = JNI_FALSE;
     agent->mAgentClassName                           = NULL;
     agent->mOptionsString                            = NULL;
+    agent->mJarfile                                  = NULL;
 
     /* make sure we can recover either handle in either direction.
      * the agent has a ref to the jvmti; make it mutual
--- a/jdk/src/java.instrument/share/native/libinstrument/JPLISAgent.h	Thu Sep 15 16:56:11 2016 -0400
+++ b/jdk/src/java.instrument/share/native/libinstrument/JPLISAgent.h	Fri Sep 16 13:15:02 2016 -0700
@@ -107,6 +107,7 @@
     jboolean                mNativeMethodPrefixAdded;     /* indicates if can_set_native_method_prefix capability has been added */
     char const *            mAgentClassName;        /* agent class name */
     char const *            mOptionsString;         /* -javaagent options string */
+    const char *            mJarfile;               /* agent jar file name */
 };
 
 /*
--- a/jdk/src/java.logging/share/classes/java/util/logging/Level.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jdk/src/java.logging/share/classes/java/util/logging/Level.java	Fri Sep 16 13:15:02 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,13 +24,22 @@
  */
 
 package java.util.logging;
+import java.lang.ref.Reference;
+import java.lang.ref.ReferenceQueue;
+import java.lang.ref.WeakReference;
 import java.lang.reflect.Module;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Optional;
 import java.util.ResourceBundle;
+import java.util.function.Function;
+import jdk.internal.loader.ClassLoaderValue;
 
 /**
  * The Level class defines a set of standard logging levels that
@@ -177,6 +186,10 @@
      */
     public static final Level ALL = new Level("ALL", Integer.MIN_VALUE, defaultBundle);
 
+    private static final Level[] standardLevels = {
+        OFF, SEVERE, WARNING, INFO, CONFIG, FINE, FINER, FINEST, ALL
+    };
+
     /**
      * Create a named Level with a given integer value.
      * <p>
@@ -267,7 +280,8 @@
         // or its defining class loader, if it's unnamed module,
         // of this Level instance that can be a custom Level subclass;
         Module module = this.getClass().getModule();
-        ResourceBundle rb = ResourceBundle.getBundle(resourceBundleName, newLocale, module);
+        ResourceBundle rb = ResourceBundle.getBundle(resourceBundleName,
+                newLocale, module);
 
         final String localizedName = rb.getString(name);
         final boolean isDefaultBundle = defaultBundle.equals(resourceBundleName);
@@ -350,12 +364,12 @@
             throw new NullPointerException();
         }
 
-        KnownLevel level;
+        Optional<Level> level;
 
         // Look for a known Level with the given non-localized name.
-        level = KnownLevel.findByName(name);
-        if (level != null) {
-            return level.mirroredLevel;
+        level = KnownLevel.findByName(name, KnownLevel::mirrored);
+        if (level.isPresent()) {
+            return level.get();
         }
 
         // Now, check if the given name is an integer.  If so,
@@ -363,21 +377,24 @@
         // if necessary create one.
         try {
             int x = Integer.parseInt(name);
-            level = KnownLevel.findByValue(x);
-            if (level == null) {
+            level = KnownLevel.findByValue(x, KnownLevel::mirrored);
+            if (!level.isPresent()) {
                 // add new Level
                 Level levelObject = new Level(name, x);
-                level = KnownLevel.findByValue(x);
+                // There's no need to use a reachability fence here because
+                // KnownLevel keeps a strong reference on the level when
+                // level.getClass() == Level.class.
+                return KnownLevel.findByValue(x, KnownLevel::mirrored).get();
             }
-            return level.mirroredLevel;
         } catch (NumberFormatException ex) {
             // Not an integer.
             // Drop through.
         }
 
-        level = KnownLevel.findByLocalizedLevelName(name);
-        if (level != null) {
-            return level.mirroredLevel;
+        level = KnownLevel.findByLocalizedLevelName(name,
+                KnownLevel::mirrored);
+        if (level.isPresent()) {
+            return level.get();
         }
 
         return null;
@@ -408,15 +425,13 @@
     // Serialization magic to prevent "doppelgangers".
     // This is a performance optimization.
     private Object readResolve() {
-        KnownLevel o = KnownLevel.matches(this);
-        if (o != null) {
-            return o.levelObject;
+        Optional<Level> level = KnownLevel.matches(this);
+        if (level.isPresent()) {
+            return level.get();
         }
-
         // Woops.  Whoever sent us this object knows
         // about a new log level.  Add it to our list.
-        Level level = new Level(this.name, this.value, this.resourceBundleName);
-        return level;
+        return new Level(this.name, this.value, this.resourceBundleName);
     }
 
     /**
@@ -450,12 +465,12 @@
         // Check that name is not null.
         name.length();
 
-        KnownLevel level;
+        Optional<Level> level;
 
         // Look for a known Level with the given non-localized name.
-        level = KnownLevel.findByName(name);
-        if (level != null) {
-            return level.levelObject;
+        level = KnownLevel.findByName(name, KnownLevel::referent);
+        if (level.isPresent()) {
+            return level.get();
         }
 
         // Now, check if the given name is an integer.  If so,
@@ -463,13 +478,16 @@
         // if necessary create one.
         try {
             int x = Integer.parseInt(name);
-            level = KnownLevel.findByValue(x);
-            if (level == null) {
-                // add new Level
-                Level levelObject = new Level(name, x);
-                level = KnownLevel.findByValue(x);
+            level = KnownLevel.findByValue(x, KnownLevel::referent);
+            if (level.isPresent()) {
+                return level.get();
             }
-            return level.levelObject;
+            // add new Level.
+            Level levelObject = new Level(name, x);
+            // There's no need to use a reachability fence here because
+            // KnownLevel keeps a strong reference on the level when
+            // level.getClass() == Level.class.
+            return KnownLevel.findByValue(x, KnownLevel::referent).get();
         } catch (NumberFormatException ex) {
             // Not an integer.
             // Drop through.
@@ -478,9 +496,9 @@
         // Finally, look for a known level with the given localized name,
         // in the current default locale.
         // This is relatively expensive, but not excessively so.
-        level = KnownLevel.findByLocalizedLevelName(name);
-        if (level != null) {
-            return level.levelObject;
+        level = KnownLevel.findByLocalizedLevelName(name, KnownLevel::referent);
+        if (level .isPresent()) {
+            return level.get();
         }
 
         // OK, we've tried everything and failed
@@ -530,22 +548,67 @@
     // If Level.getName, Level.getLocalizedName, Level.getResourceBundleName methods
     // were final, the following KnownLevel implementation can be removed.
     // Future API change should take this into consideration.
-    static final class KnownLevel {
+    static final class KnownLevel extends WeakReference<Level> {
         private static Map<String, List<KnownLevel>> nameToLevels = new HashMap<>();
         private static Map<Integer, List<KnownLevel>> intToLevels = new HashMap<>();
-        final Level levelObject;     // instance of Level class or Level subclass
+        private static final ReferenceQueue<Level> QUEUE = new ReferenceQueue<>();
+
+        // CUSTOM_LEVEL_CLV is used to register custom level instances with
+        // their defining class loader, so that they are garbage collected
+        // if and only if their class loader is no longer strongly
+        // referenced.
+        private static final ClassLoaderValue<List<Level>> CUSTOM_LEVEL_CLV =
+                    new ClassLoaderValue<>();
+
         final Level mirroredLevel;   // mirror of the custom Level
         KnownLevel(Level l) {
-            this.levelObject = l;
+            super(l, QUEUE);
             if (l.getClass() == Level.class) {
                 this.mirroredLevel = l;
             } else {
                 // this mirrored level object is hidden
-                this.mirroredLevel = new Level(l.name, l.value, l.resourceBundleName, false);
+                this.mirroredLevel = new Level(l.name, l.value,
+                        l.resourceBundleName, false);
             }
         }
 
+        Optional<Level> mirrored() {
+            return Optional.of(mirroredLevel);
+        }
+
+        Optional<Level> referent() {
+            return Optional.ofNullable(get());
+        }
+
+        private void remove() {
+            Optional.ofNullable(nameToLevels.get(mirroredLevel.name))
+                    .ifPresent((x) -> x.remove(this));
+            Optional.ofNullable(intToLevels.get(mirroredLevel.value))
+                    .ifPresent((x) -> x.remove(this));
+        }
+
+        // Remove all stale KnownLevel instances
+        static synchronized void purge() {
+            Reference<? extends Level> ref;
+            while ((ref = QUEUE.poll()) != null) {
+                if (ref instanceof KnownLevel) {
+                    ((KnownLevel)ref).remove();
+                }
+            }
+        }
+
+        private static void registerWithClassLoader(Level customLevel) {
+            PrivilegedAction<ClassLoader> pa =
+                  () -> customLevel.getClass().getClassLoader();
+            PrivilegedAction<String> pn =  customLevel.getClass()::getName;
+            final String name = AccessController.doPrivileged(pn);
+            final ClassLoader cl = AccessController.doPrivileged(pa);
+            CUSTOM_LEVEL_CLV.computeIfAbsent(cl, (c, v) -> new ArrayList<>())
+                .add(customLevel);
+        }
+
         static synchronized void add(Level l) {
+            purge();
             // the mirroredLevel object is always added to the list
             // before the custom Level instance
             KnownLevel o = new KnownLevel(l);
@@ -562,24 +625,36 @@
                 intToLevels.put(l.value, list);
             }
             list.add(o);
+
+            // keep the custom level reachable from its class loader
+            // This will ensure that custom level values are not GC'ed
+            // until there class loader is GC'ed.
+            if (o.mirroredLevel != l) {
+                registerWithClassLoader(l);
+            }
+
         }
 
         // Returns a KnownLevel with the given non-localized name.
-        static synchronized KnownLevel findByName(String name) {
-            List<KnownLevel> list = nameToLevels.get(name);
-            if (list != null) {
-                return list.get(0);
-            }
-            return null;
+        static synchronized Optional<Level> findByName(String name,
+                Function<KnownLevel, Optional<Level>> selector) {
+            purge();
+            return nameToLevels.getOrDefault(name, Collections.emptyList())
+                        .stream()
+                        .map(selector)
+                        .flatMap(Optional::stream)
+                        .findFirst();
         }
 
         // Returns a KnownLevel with the given value.
-        static synchronized KnownLevel findByValue(int value) {
-            List<KnownLevel> list = intToLevels.get(value);
-            if (list != null) {
-                return list.get(0);
-            }
-            return null;
+        static synchronized Optional<Level> findByValue(int value,
+                Function<KnownLevel, Optional<Level>> selector) {
+            purge();
+            return intToLevels.getOrDefault(value, Collections.emptyList())
+                        .stream()
+                        .map(selector)
+                        .flatMap(Optional::stream)
+                        .findFirst();
         }
 
         // Returns a KnownLevel with the given localized name matching
@@ -587,32 +662,34 @@
         // from the resourceBundle associated with the Level object).
         // This method does not call Level.getLocalizedName() that may
         // be overridden in a subclass implementation
-        static synchronized KnownLevel findByLocalizedLevelName(String name) {
-            for (List<KnownLevel> levels : nameToLevels.values()) {
-                for (KnownLevel l : levels) {
-                    String lname = l.levelObject.getLocalizedLevelName();
-                    if (name.equals(lname)) {
-                        return l;
-                    }
-                }
-            }
-            return null;
+        static synchronized Optional<Level> findByLocalizedLevelName(String name,
+                Function<KnownLevel, Optional<Level>> selector) {
+            purge();
+            return nameToLevels.values().stream()
+                         .flatMap(List::stream)
+                         .map(selector)
+                         .flatMap(Optional::stream)
+                         .filter(l -> name.equals(l.getLocalizedLevelName()))
+                         .findFirst();
         }
 
-        static synchronized KnownLevel matches(Level l) {
+        static synchronized Optional<Level> matches(Level l) {
+            purge();
             List<KnownLevel> list = nameToLevels.get(l.name);
             if (list != null) {
-                for (KnownLevel level : list) {
-                    Level other = level.mirroredLevel;
+                for (KnownLevel ref : list) {
+                    Level levelObject = ref.get();
+                    if (levelObject == null) continue;
+                    Level other = ref.mirroredLevel;
                     if (l.value == other.value &&
                            (l.resourceBundleName == other.resourceBundleName ||
                                (l.resourceBundleName != null &&
                                 l.resourceBundleName.equals(other.resourceBundleName)))) {
-                        return level;
+                        return Optional.of(levelObject);
                     }
                 }
             }
-            return null;
+            return Optional.empty();
         }
     }
 
--- a/jdk/src/jdk.attach/linux/classes/sun/tools/attach/VirtualMachineImpl.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jdk/src/jdk.attach/linux/classes/sun/tools/attach/VirtualMachineImpl.java	Fri Sep 16 13:15:02 2016 -0700
@@ -308,10 +308,6 @@
 
     //-- native methods
 
-    static native boolean isLinuxThreads();
-
-    static native int getLinuxThreadsManager(int pid) throws IOException;
-
     static native void sendQuitToChildrenOf(int pid) throws IOException;
 
     static native void sendQuitTo(int pid) throws IOException;
--- a/jdk/src/jdk.attach/linux/native/libattach/VirtualMachineImpl.c	Thu Sep 15 16:56:11 2016 -0400
+++ b/jdk/src/jdk.attach/linux/native/libattach/VirtualMachineImpl.c	Fri Sep 16 13:15:02 2016 -0700
@@ -195,113 +195,6 @@
 }
 
 /*
- * Class:     sun_tools_attach_VirtualMachineImpl
- * Method:    isLinuxThreads
- * Signature: ()V
- */
-JNIEXPORT jboolean JNICALL Java_sun_tools_attach_VirtualMachineImpl_isLinuxThreads
-  (JNIEnv *env, jclass cls)
-{
-# ifndef _CS_GNU_LIBPTHREAD_VERSION
-# define _CS_GNU_LIBPTHREAD_VERSION 3
-# endif
-    size_t n;
-    char* s;
-    jboolean res;
-
-    n = confstr(_CS_GNU_LIBPTHREAD_VERSION, NULL, 0);
-    if (n <= 0) {
-       /* glibc before 2.3.2 only has LinuxThreads */
-       return JNI_TRUE;
-    }
-
-    s = (char *)malloc(n);
-    if (s == NULL) {
-        JNU_ThrowOutOfMemoryError(env, "malloc failed");
-        return JNI_TRUE;
-    }
-    confstr(_CS_GNU_LIBPTHREAD_VERSION, s, n);
-
-    /*
-     * If the LIBPTHREAD version include "NPTL" then we know we
-     * have the new threads library and not LinuxThreads
-     */
-    res = (jboolean)(strstr(s, "NPTL") == NULL);
-    free(s);
-    return res;
-}
-
-/*
- * Structure and callback function used to count the children of
- * a given process, and record the pid of the "manager thread".
- */
-typedef struct {
-    pid_t ppid;
-    int count;
-    pid_t mpid;
-} ChildCountContext;
-
-static void ChildCountCallback(const pid_t pid, void* user_data) {
-    ChildCountContext* context = (ChildCountContext*)user_data;
-    if (getParent(pid) == context->ppid) {
-        context->count++;
-        /*
-         * Remember the pid of the first child. If the final count is
-         * one then this is the pid of the LinuxThreads manager.
-         */
-        if (context->count == 1) {
-            context->mpid = pid;
-        }
-    }
-}
-
-/*
- * Class:     sun_tools_attach_VirtualMachineImpl
- * Method:    getLinuxThreadsManager
- * Signature: (I)I
- */
-JNIEXPORT jint JNICALL Java_sun_tools_attach_VirtualMachineImpl_getLinuxThreadsManager
-  (JNIEnv *env, jclass cls, jint pid)
-{
-    ChildCountContext context;
-
-    /*
-     * Iterate over all processes to find how many children 'pid' has
-     */
-    context.ppid = pid;
-    context.count = 0;
-    context.mpid = (pid_t)0;
-    forEachProcess(ChildCountCallback, (void*)&context);
-
-    /*
-     * If there's no children then this is likely the pid of the primordial
-     * created by the launcher - in that case the LinuxThreads manager is the
-     * parent of this process.
-     */
-    if (context.count == 0) {
-        pid_t parent = getParent(pid);
-        if ((int)parent > 0) {
-            return (jint)parent;
-        }
-    }
-
-    /*
-     * There's one child so this is likely the embedded VM case where the
-     * the primordial thread == LinuxThreads initial thread. The LinuxThreads
-     * manager in that case is the child.
-     */
-    if (context.count == 1) {
-        return (jint)context.mpid;
-    }
-
-    /*
-     * If we get here it's most likely we were given the wrong pid
-     */
-    JNU_ThrowIOException(env, "Unable to get pid of LinuxThreads manager thread");
-    return -1;
-}
-
-/*
  * Structure and callback function used to send a QUIT signal to all
  * children of a given process
  */
--- a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/builder/DefaultImageBuilder.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/builder/DefaultImageBuilder.java	Fri Sep 16 13:15:02 2016 -0700
@@ -55,6 +55,7 @@
 import java.util.Optional;
 import java.util.Properties;
 import java.util.Set;
+import java.util.stream.Collectors;
 import jdk.tools.jlink.internal.BasicImageWriter;
 import jdk.tools.jlink.internal.plugins.FileCopierPlugin.SymImageFile;
 import jdk.tools.jlink.internal.ExecutableImage;
@@ -159,7 +160,7 @@
             }
             i++;
         }
-        props.setProperty("MODULES", builder.toString());
+        props.setProperty("MODULES", quote(builder.toString()));
     }
 
     @Override
@@ -188,7 +189,8 @@
 
             storeFiles(modules, release);
 
-            if (Files.getFileStore(root).supportsFileAttributeView(PosixFileAttributeView.class)) {
+            if (root.getFileSystem().supportedFileAttributeViews()
+                    .contains("posix")) {
                 // launchers in the bin directory need execute permission.
                 // On Windows, "bin" also subdirectories containing jvm.dll.
                 if (Files.isDirectory(bin)) {
@@ -217,19 +219,38 @@
         }
     }
 
+    // Parse version string and return a string that includes only version part
+    // leaving "pre", "build" information. See also: java.lang.Runtime.Version.
+    private static String parseVersion(String str) {
+        return Runtime.Version.parse(str).
+            version().
+            stream().
+            map(Object::toString).
+            collect(Collectors.joining("."));
+    }
+
+    private static String quote(String str) {
+        return "\"" + str + "\"";
+    }
+
     private Properties releaseProperties(ResourcePool pool) throws IOException {
         Properties props = new Properties();
         Optional<ResourcePoolModule> javaBase = pool.moduleView().findModule("java.base");
         javaBase.ifPresent(mod -> {
             // fill release information available from transformed "java.base" module!
             ModuleDescriptor desc = mod.descriptor();
-            desc.osName().ifPresent(s -> props.setProperty("OS_NAME", s));
-            desc.osVersion().ifPresent(s -> props.setProperty("OS_VERSION", s));
-            desc.osArch().ifPresent(s -> props.setProperty("OS_ARCH", s));
-            props.setProperty("JAVA_VERSION", System.getProperty("java.version"));
+            desc.osName().ifPresent(s -> {
+                props.setProperty("OS_NAME", quote(s));
+                this.targetOsName = s;
+            });
+            desc.osVersion().ifPresent(s -> props.setProperty("OS_VERSION", quote(s)));
+            desc.osArch().ifPresent(s -> props.setProperty("OS_ARCH", quote(s)));
+            desc.version().ifPresent(s -> props.setProperty("JAVA_VERSION",
+                    quote(parseVersion(s.toString()))));
+            desc.version().ifPresent(s -> props.setProperty("JAVA_FULL_VERSION",
+                    quote(s.toString())));
         });
 
-        this.targetOsName = props.getProperty("OS_NAME");
         if (this.targetOsName == null) {
             throw new PluginException("TargetPlatform attribute is missing for java.base module");
         }
@@ -282,8 +303,8 @@
                         StandardOpenOption.CREATE_NEW)) {
                     writer.write(sb.toString());
                 }
-                if (Files.getFileStore(root.resolve("bin"))
-                        .supportsFileAttributeView(PosixFileAttributeView.class)) {
+                if (root.resolve("bin").getFileSystem()
+                        .supportedFileAttributeViews().contains("posix")) {
                     setExecutable(cmd);
                 }
                 // generate .bat file for Windows
--- a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/IncludeLocalesPlugin.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/IncludeLocalesPlugin.java	Fri Sep 16 13:15:02 2016 -0700
@@ -264,8 +264,8 @@
 
         // Add Thai BreakIterator related data files
         if (tag.equals("th")) {
-            files.add(".+sun/text/resources/thai_dict");
-            files.add(".+sun/text/resources/[^_]+BreakIteratorData_th");
+            files.add(".+sun/text/resources/ext/thai_dict");
+            files.add(".+sun/text/resources/ext/[^_]+BreakIteratorData_th");
         }
 
         // Add Taiwan resource bundles for Hong Kong
Binary file jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/thai_dict has changed
Binary file jdk/src/jdk.localedata/share/classes/sun/text/resources/thai_dict has changed
--- a/jdk/test/ProblemList.txt	Thu Sep 15 16:56:11 2016 -0400
+++ b/jdk/test/ProblemList.txt	Fri Sep 16 13:15:02 2016 -0700
@@ -159,7 +159,6 @@
 
 # jdk_net
 
-
 java/net/MulticastSocket/NoLoopbackPackets.java                 7122846 macosx-all
 java/net/MulticastSocket/SetLoopbackMode.java                   7122846 macosx-all
 
@@ -217,66 +216,6 @@
 
 sun/security/tools/jarsigner/warnings/BadKeyUsageTest.java      8026393 generic-all
 
-sun/security/pkcs11/Cipher/ReinitCipher.java                    8077138,8023434 windows-all
-sun/security/pkcs11/Cipher/TestPKCS5PaddingError.java           8077138,8023434 windows-all
-sun/security/pkcs11/Cipher/TestRSACipher.java                   8077138,8023434 windows-all
-sun/security/pkcs11/Cipher/TestRSACipherWrap.java               8077138,8023434 windows-all
-sun/security/pkcs11/Cipher/TestRawRSACipher.java                8077138,8023434 windows-all
-sun/security/pkcs11/Cipher/TestSymmCiphers.java                 8077138,8023434 windows-all
-sun/security/pkcs11/Cipher/TestSymmCiphersNoPad.java            8077138,8023434 windows-all
-sun/security/pkcs11/KeyAgreement/TestDH.java                    8077138,8023434 windows-all
-sun/security/pkcs11/KeyAgreement/TestInterop.java               8077138,8023434 windows-all
-sun/security/pkcs11/KeyAgreement/TestShort.java                 8077138,8023434 windows-all
-sun/security/pkcs11/KeyAgreement/SupportedDHKeys.java           8077138 windows-all
-sun/security/pkcs11/KeyAgreement/UnsupportedDHKeys.java         8077138 windows-all
-sun/security/pkcs11/KeyGenerator/DESParity.java                 8077138,8023434 windows-all
-sun/security/pkcs11/KeyGenerator/TestKeyGenerator.java          8077138,8023434 windows-all
-sun/security/pkcs11/KeyPairGenerator/TestDH2048.java            8077138,8023434 windows-all
-sun/security/pkcs11/KeyStore/SecretKeysBasic.sh                 8077138,8023434 windows-all
-sun/security/pkcs11/Mac/MacKAT.java                             8077138,8023434 windows-all
-sun/security/pkcs11/Mac/MacSameTest.java                        8077138,8023434 windows-all
-sun/security/pkcs11/Mac/ReinitMac.java                          8077138,8023434 windows-all
-sun/security/pkcs11/MessageDigest/ByteBuffers.java              8077138,8023434 windows-all
-sun/security/pkcs11/MessageDigest/DigestKAT.java                8077138,8023434 windows-all
-sun/security/pkcs11/MessageDigest/ReinitDigest.java             8077138,8023434 windows-all
-sun/security/pkcs11/MessageDigest/TestCloning.java              8077138,8023434 windows-all
-sun/security/pkcs11/Provider/ConfigQuotedString.sh              8077138,8023434 windows-all
-sun/security/pkcs11/Provider/Login.sh                           8077138,8023434 windows-all
-sun/security/pkcs11/SampleTest.java                             8077138,8023434 windows-all
-sun/security/pkcs11/Secmod/AddPrivateKey.java                   8077138,8023434 windows-all
-sun/security/pkcs11/Secmod/AddTrustedCert.java                  8077138,8023434 windows-all
-sun/security/pkcs11/Secmod/Crypto.java                          8077138,8023434 windows-all
-sun/security/pkcs11/Secmod/GetPrivateKey.java                   8077138,8023434 windows-all
-sun/security/pkcs11/Secmod/JksSetPrivateKey.java                8077138,8023434 windows-all
-sun/security/pkcs11/Secmod/LoadKeystore.java                    8077138,8023434 windows-all
-sun/security/pkcs11/SecureRandom/Basic.java                     8077138,8023434 windows-all
-sun/security/pkcs11/SecureRandom/TestDeserialization.java       8077138,8023434 windows-all
-sun/security/pkcs11/Serialize/SerializeProvider.java            8077138,8023434 windows-all
-sun/security/pkcs11/Signature/ByteBuffers.java                  8077138,8023434 windows-all
-sun/security/pkcs11/Signature/ReinitSignature.java              8077138,8023434 windows-all
-sun/security/pkcs11/Signature/TestDSA.java                      8077138,8023434 windows-all
-sun/security/pkcs11/Signature/TestDSAKeyLength.java             8077138,8023434 windows-all
-sun/security/pkcs11/Signature/TestRSAKeyLength.java             8077138,8023434 windows-all
-sun/security/pkcs11/ec/ReadCertificates.java                    8077138,8023434 windows-all
-sun/security/pkcs11/ec/ReadPKCS12.java                          8077138,8023434 windows-all
-sun/security/pkcs11/ec/TestCurves.java                          8077138,8023434 windows-all
-sun/security/pkcs11/ec/TestECDH.java                            8077138,8023434 windows-all
-sun/security/pkcs11/ec/TestECDH2.java                           8077138,8023434 windows-all
-sun/security/pkcs11/ec/TestECDSA.java                           8077138,8023434 windows-all
-sun/security/pkcs11/ec/TestECDSA2.java                          8077138,8023434 windows-all
-sun/security/pkcs11/ec/TestECGenSpec.java                       8077138,8023434 windows-all
-sun/security/pkcs11/rsa/KeyWrap.java                            8077138,8023434 windows-all
-sun/security/pkcs11/rsa/TestCACerts.java                        8077138,8023434 windows-all
-sun/security/pkcs11/rsa/TestKeyFactory.java                     8077138,8023434 windows-all
-sun/security/pkcs11/rsa/TestKeyPairGenerator.java               8077138,8023434 windows-all
-sun/security/pkcs11/rsa/TestSignatures.java                     8077138,8023434 windows-all
-sun/security/pkcs11/sslecc/ClientJSSEServerJSSE.java            8077138,8023434 windows-all
-sun/security/pkcs11/tls/TestKeyMaterial.java                    8077138,8023434 windows-all
-sun/security/pkcs11/tls/TestLeadingZeroesP11.java               8077138,8023434 windows-all
-sun/security/pkcs11/tls/TestMasterSecret.java                   8077138,8023434 windows-all
-sun/security/pkcs11/tls/TestPRF.java                            8077138,8023434 windows-all
-sun/security/pkcs11/tls/TestPremaster.java                      8077138,8023434 windows-all
-
 sun/security/krb5/auto/HttpNegotiateServer.java                 8038079 generic-all
 
 sun/security/ssl/SSLSocketImpl/AsyncSSLSocketClose.java         8161232 macosx-all
@@ -312,8 +251,6 @@
 
 tools/launcher/FXLauncherTest.java                              8068049 linux-all,macosx-all
 
-tools/pack200/Pack200Props.java                                 8155857 generic-all
-
 ############################################################################
 
 # jdk_jdi
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/lang/instrument/CustomSystemLoader/Agent.java	Fri Sep 16 13:15:02 2016 -0700
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.io.PrintStream;
+import java.lang.instrument.*;
+import java.lang.reflect.Field;
+
+/**
+  * @test
+  * @bug 8160950
+  * @summary test for custom system class loader
+  *
+  * @run build App Agent CustomLoader
+  * @run shell ../MakeJAR3.sh Agent 'Can-Retransform-Classes: true'
+  * @run main/othervm -javaagent:Agent.jar -Djava.system.class.loader=CustomLoader App
+  */
+
+public class Agent {
+    private static PrintStream err = System.err;
+    private static PrintStream out = System.out;
+    public  static boolean failed = false;
+
+    public static void premain(String agentArgs, Instrumentation instrumentation) {
+        ClassLoader myClassLoader = Agent.class.getClassLoader();
+        out.println("Agent: started; myClassLoader: " + myClassLoader);
+        try {
+            Field fld = myClassLoader.getClass().getField("agentClassLoader");
+            fld.set(myClassLoader.getClass(), myClassLoader);
+        } catch (Exception ex) {
+            failed = true;
+            ex.printStackTrace();
+        }
+        out.println("Agent: finished");
+   }
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/lang/instrument/CustomSystemLoader/App.java	Fri Sep 16 13:15:02 2016 -0700
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.io.PrintStream;
+
+public class App {
+
+    public static void main(String args[]) throws Exception {
+        (new App()).run(args, System.out);
+    }
+
+    public void run(String args[], PrintStream out) throws Exception {
+        out.println("App: Test started");
+        if (CustomLoader.agentClassLoader != CustomLoader.myself) {
+            System.out.println("App: agentClassLoader:    " + CustomLoader.agentClassLoader);
+            System.out.println("App: CustomLoader.myself: " + CustomLoader.myself);
+            System.out.println("App: myClassLoader:       " + App.class.getClassLoader());
+            throw new Exception("App: Agent's system class loader is not CustomLoader");
+        } else if (Agent.failed) {
+            throw new Exception("App: Agent failed");
+        } else if (CustomLoader.failed) {
+            throw new Exception("App: CustomLoader failed");
+        }
+        out.println("App: Test passed");
+    }
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/lang/instrument/CustomSystemLoader/CustomLoader.java	Fri Sep 16 13:15:02 2016 -0700
@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.io.DataInputStream;
+import java.io.InputStream;
+import java.io.IOException;
+import java.io.PrintStream;
+import java.util.jar.JarFile;
+import java.util.zip.ZipEntry;
+
+public class CustomLoader extends ClassLoader {
+    private static PrintStream out = System.out;
+    public  static ClassLoader myself;
+    public  static ClassLoader agentClassLoader;
+    public  static boolean failed = true;
+
+    public CustomLoader(ClassLoader classLoader) {
+        super(classLoader);
+        myself = this;
+    }
+
+    @Override
+    public Class<?> loadClass(String name) throws ClassNotFoundException {
+        out.println("CustomLoader: loading class: " + name);
+        if (name.equals("Agent")) {
+            Class c = null;
+            try {
+                byte[] buf = locateBytes();
+                c = defineClass(name, buf, 0, buf.length);
+            } catch (IOException ex) {
+                throw new ClassNotFoundException(ex.getMessage());
+            }
+            resolveClass(c);
+            out.println("CustomLoader.loadClass after resolveClass: " + name +
+                        "; Class: " + c + "; ClassLoader: " + c.getClassLoader());
+            return c;
+        }
+        return super.loadClass(name);
+    }
+
+    private byte[] locateBytes() throws IOException {
+        try {
+            JarFile jar = new JarFile("Agent.jar");
+            InputStream is = jar.getInputStream(jar.getEntry("Agent.class"));
+            int len = is.available();
+            byte[] buf = new byte[len];
+            DataInputStream in = new DataInputStream(is);
+            in.readFully(buf);
+            return buf;
+        } catch (IOException ioe) {
+            ioe.printStackTrace();
+            throw new IOException("Test failed due to IOException!");
+        }
+    }
+
+    void appendToClassPathForInstrumentation(String path) {
+        out.println("CustomLoader.appendToClassPathForInstrumentation: " +
+                    this + ", jar: " + path);
+        failed = false;
+    }
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/security/cert/CertPathValidator/trustAnchor/ValWithAnchorByName.java	Fri Sep 16 13:15:02 2016 -0700
@@ -0,0 +1,292 @@
+/*
+ * Copyright (c) 2004, 2016, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8132926
+ * @summary PKIXParameters built with public key form of TrustAnchor causes
+ *          NPE during cert path building/validation
+ * @run main ValWithAnchorByName
+ */
+
+import java.io.ByteArrayInputStream;
+import java.security.cert.CertificateException;
+import java.security.cert.CertificateFactory;
+import java.security.cert.CertPath;
+import java.security.cert.CertPathValidator;
+import java.security.cert.PKIXParameters;
+import java.security.cert.PKIXRevocationChecker;
+import java.security.cert.TrustAnchor;
+import java.security.cert.X509Certificate;
+import java.util.ArrayList;
+import java.util.Base64;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.HashMap;
+
+// To get certpath debugging, add -Djava.security.debug=certpath
+
+public class ValWithAnchorByName {
+
+    // The following certificates and OCSP responses were captured from
+    // a test run that used certificates and responses generated by
+    // sun.security.testlibrary.CertificateBuilder and
+    // sun.security.testlibrary.SimpleOCSPServer.
+
+    // Subject: CN=SSLCertificate, O=SomeCompany
+    // Issuer: CN=Intermediate CA Cert, O=SomeCompany
+    // Validity: Tue Aug 30 14:37:19 PDT 2016 to Wed Aug 30 14:37:19 PDT 2017
+    private static final String EE_CERT =
+        "-----BEGIN CERTIFICATE-----\n" +
+        "MIIDnTCCAoWgAwIBAgICEAAwDQYJKoZIhvcNAQELBQAwNTEUMBIGA1UEChMLU29t\n" +
+        "ZUNvbXBhbnkxHTAbBgNVBAMTFEludGVybWVkaWF0ZSBDQSBDZXJ0MB4XDTE2MDgz\n" +
+        "MDIxMzcxOVoXDTE3MDgzMDIxMzcxOVowLzEUMBIGA1UEChMLU29tZUNvbXBhbnkx\n" +
+        "FzAVBgNVBAMTDlNTTENlcnRpZmljYXRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A\n" +
+        "MIIBCgKCAQEAjgv8KKE4CO0rbCjRLA1hXjRiSq30jeusCJ8frbRG+QOBgQ3j6jgc\n" +
+        "vk5wG1aTu7R4AFn0/HRDMzP9ZbRlZVIbJUTd8YiaNyZeyWapPnxHWrPCd5e1xopk\n" +
+        "ElieDdEH5FiLGtIrWy56CGA1hfQb1vUVYegyeY+TTtMFVHt0PrmMk4ZRgj/GtVNp\n" +
+        "BQQYIzaYAcrcWMeCn30ZrhaGAL1hsdgmEVV1wsTD4JeNMSwLwMYem7fg8ondGZIR\n" +
+        "kZuGtuSdOHu4Xz+mgDNXTeX/Bp/dQFucxCG+FOOM9Hoz72RY2W8YqgL38RlnwYWp\n" +
+        "nUNxhXWFH6vyINRQVEu3IgahR6HXjxM7LwIDAQABo4G8MIG5MBQGA1UdEQQNMAuC\n" +
+        "CWxvY2FsaG9zdDAyBggrBgEFBQcBAQQmMCQwIgYIKwYBBQUHMAGGFmh0dHA6Ly9s\n" +
+        "b2NhbGhvc3Q6NDIzMzMwHwYDVR0jBBgwFoAUYT525lwHCI4CmuWs8a7poaeKRJ4w\n" +
+        "HQYDVR0OBBYEFCaQnOX4L1ovqyfeKuoay+kI+lXgMA4GA1UdDwEB/wQEAwIFoDAd\n" +
+        "BgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDQYJKoZIhvcNAQELBQADggEB\n" +
+        "AD8dqQIqFasJcL8lm4mPTsBl0JgNiN8tQcXM7VCvcH+yDvEyh9vudDjuhpSORqPq\n" +
+        "f1o/EvJ+gfs269mBnYQujYRvmSd6EAcBntv5zn6amOh03o6PqTY9KaUC/mL9hB84\n" +
+        "Y5/LYioP16sME7egKnlrGUgKh0ZvGzm7c3SYx3Z5YoeFBOkZajc7Jm+cBw/uBQkF\n" +
+        "a9mLEczIvOgkq1wto8vr2ptH1gEuvFRcorN3muvq34bk40G08+AHlP3fCLFpI3FA\n" +
+        "IStJLJZRcO+Ib4sOcKuaBGnuMo/QVOCEMDUs6RgiWtSd93OZKFIUOASVp6YIkcSs\n" +
+        "5/rmc06sICqBjLfPEB68Jjw=\n" +
+        "-----END CERTIFICATE-----";
+
+    // Subject: CN=Intermediate CA Cert, O=SomeCompany
+    // Issuer: CN=Root CA Cert, O=SomeCompany
+    // Validity: Sun Aug 07 14:37:19 PDT 2016 to Tue Aug 07 14:37:19 PDT 2018
+    private static final String INT_CA_CERT =
+        "-----BEGIN CERTIFICATE-----\n" +
+        "MIIDdjCCAl6gAwIBAgIBZDANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtTb21l\n" +
+        "Q29tcGFueTEVMBMGA1UEAxMMUm9vdCBDQSBDZXJ0MB4XDTE2MDgwNzIxMzcxOVoX\n" +
+        "DTE4MDgwNzIxMzcxOVowNTEUMBIGA1UEChMLU29tZUNvbXBhbnkxHTAbBgNVBAMT\n" +
+        "FEludGVybWVkaWF0ZSBDQSBDZXJ0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB\n" +
+        "CgKCAQEAnJR5CnE7GKlQjigExSJ6hHu302mc0PcA6TDgsIitPYD/r8RBbBuE51OQ\n" +
+        "7IP7AXmfPUV3/+pO/uxx6mgY5O6XeUl7KadhVPtPcL0BVVevCSOdTMVa3iV4zRpa\n" +
+        "C6Uy2ouUFnafKnDtlbieggyETUoNgVNJYA9L0XNhtSnENoLHC4Pq0v8OsNtsOWFR\n" +
+        "NiMTOA49NNDBw85WgPyFAxjqO4z0J0zxdWq3W4rSMB8xrkulv2Rvj3GcfYJK/ab8\n" +
+        "V1IJ6PMWCpujASY3BzvYPnN7BKuBjbWJPgZdPYfX1cxeG80u0tOuMfWWiNONSMSA\n" +
+        "7m9y304QA0gKqlrFFn9U4hU89kv1IwIDAQABo4GYMIGVMA8GA1UdEwEB/wQFMAMB\n" +
+        "Af8wMgYIKwYBBQUHAQEEJjAkMCIGCCsGAQUFBzABhhZodHRwOi8vbG9jYWxob3N0\n" +
+        "OjM5MTM0MB8GA1UdIwQYMBaAFJNMsejEyJUB9tiWycVczvpiMVQZMB0GA1UdDgQW\n" +
+        "BBRhPnbmXAcIjgKa5azxrumhp4pEnjAOBgNVHQ8BAf8EBAMCAYYwDQYJKoZIhvcN\n" +
+        "AQELBQADggEBAE4nOFdW9OirPnRvxihQXYL9CXLuGQz5tr0XgN8wSY6Un9b6CRiK\n" +
+        "7obgIGimVdhvUC1qdRcwJqgOfJ2/jR5/5Qo0TVp+ww4dHNdUoj73tagJ7jTu0ZMz\n" +
+        "5Zdp0uwd4RD/syvTeVcbPc3m4awtgEvRgzpDMcSeKPZWInlo7fbnowKSAUAfO8de\n" +
+        "0cDkxEBkzPIzGNu256cdLZOqOK9wLJ9mQ0zKgi/2NsldNc2pl/6jkGpA6uL5lJsm\n" +
+        "fo9sDusWNHV1YggqjDQ19hrf40VuuC9GFl/qAW3marMuEzY/NiKVUxty1q1s48SO\n" +
+        "g5LoEPDDkbygOt7ICL3HYG1VufhC1Q2YY9c=\n" +
+        "-----END CERTIFICATE-----";
+
+    // Subject: CN=Root CA Cert, O=SomeCompany
+    // Issuer: CN=Root CA Cert, O=SomeCompany
+    // Validity: Fri Jul 08 14:37:18 PDT 2016 to Fri Jun 28 14:37:18 PDT 2019
+    private static final String ROOT_CA_CERT =
+        "-----BEGIN CERTIFICATE-----\n" +
+        "MIIDODCCAiCgAwIBAgIBATANBgkqhkiG9w0BAQsFADAtMRQwEgYDVQQKEwtTb21l\n" +
+        "Q29tcGFueTEVMBMGA1UEAxMMUm9vdCBDQSBDZXJ0MB4XDTE2MDcwODIxMzcxOFoX\n" +
+        "DTE5MDYyODIxMzcxOFowLTEUMBIGA1UEChMLU29tZUNvbXBhbnkxFTATBgNVBAMT\n" +
+        "DFJvb3QgQ0EgQ2VydDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIlN\n" +
+        "M3WYEqkU2elXEZrV9QSDbDKwyaLEHafLFciH8Edoag3q/7jEzFJxI7JZ831tdbWQ\n" +
+        "Bm6Hgo+8pvetOFW1BckL8eIjyOONP2CKfFaeMaozsWi1cgxa+rjpU/Rekc+zBqvv\n" +
+        "y4Sr97TwT6nQiLlgjC1nCfR1SVpO51qoDChS7n785rsKEZxw/p+kkVWSZffU7zN9\n" +
+        "c645cPg//L/kjiyeKMkaquGQOYS68gQgy8YZXQv1E3l/8e8Ci1s1DYA5wpCbaBqg\n" +
+        "Tw84Rr4zlUEQBgXzQlRt+mPzeaDpdG1EeGkXrcdkZ+0EMELoOVXOEn6VNsz6vT3I\n" +
+        "KrnvQBSnN06xq/iWwC0CAwEAAaNjMGEwDwYDVR0TAQH/BAUwAwEB/zAfBgNVHSME\n" +
+        "GDAWgBSTTLHoxMiVAfbYlsnFXM76YjFUGTAdBgNVHQ4EFgQUk0yx6MTIlQH22JbJ\n" +
+        "xVzO+mIxVBkwDgYDVR0PAQH/BAQDAgGGMA0GCSqGSIb3DQEBCwUAA4IBAQAAi+Nl\n" +
+        "sxP9t2IhiZIHRJGSBZuQlXIjwYIwbq3ZWc/ApZ+0oxtl7DYQi5uRNt8/opcGNCHc\n" +
+        "IY0fG93SbkDubXbxPYBW6D/RUjbz59ZryaP5ym55p1MjHTOqy+AM8g41xNTJikc3\n" +
+        "UUFXXnckeFbawijCsb7vf71owzKuxgBXi9n1rmXXtncKoA/LrUVXoUlKefdgDnsU\n" +
+        "sl3Q29eibE3HSqziMMoAOLm0jjekFGWIgLeTtyRYR1d0dNaUwsHTrQpPjxxUTn1x\n" +
+        "sAPpXKfzPnsYAZeeiaaE75GwbWlHzrNinvxdZQd0zctpfBJfVqD/+lWANlw+rOaK\n" +
+        "J2GyCaJINsyaI/I2\n" +
+        "-----END CERTIFICATE-----";
+
+    // OCSP Response Status: successful (0x0)
+    // Response Type: Basic OCSP Response
+    // Version: 1 (0x0)
+    // Responder Id: CN=Intermediate CA Cert, O=SomeCompany
+    // Produced At: Sep  6 21:37:20 2016 GMT
+    // Responses:
+    // Certificate ID:
+    //    Hash Algorithm: sha1
+    //    Issuer Name Hash: 7ED23D4396152EAB7D0C4AD8C1CA1418AA05DD54
+    //    Issuer Key Hash: 613E76E65C07088E029AE5ACF1AEE9A1A78A449E
+    //    Serial Number: 1000
+    // Cert Status: good
+    // This Update: Sep  6 21:37:20 2016 GMT
+    // Next Update: Sep  6 22:37:19 2016 GMT
+    private static final String EE_OCSP_RESP =
+        "MIIFbAoBAKCCBWUwggVhBgkrBgEFBQcwAQEEggVSMIIFTjCBtaE3MDUxFDASBgNV\n" +
+        "BAoTC1NvbWVDb21wYW55MR0wGwYDVQQDExRJbnRlcm1lZGlhdGUgQ0EgQ2VydBgP\n" +
+        "MjAxNjA5MDYyMTM3MjBaMGUwYzA7MAkGBSsOAwIaBQAEFH7SPUOWFS6rfQxK2MHK\n" +
+        "FBiqBd1UBBRhPnbmXAcIjgKa5azxrumhp4pEngICEACAABgPMjAxNjA5MDYyMTM3\n" +
+        "MjBaoBEYDzIwMTYwOTA2MjIzNzE5WqECMAAwDQYJKoZIhvcNAQELBQADggEBAF13\n" +
+        "cLwxDG8UYPIbzID86vZGOWUuv5c35VnvebMk/ajAUdpItDYshIQVi90Z8BB2TEi/\n" +
+        "wtx1aNkIv7db0uQ0NnRfvME8vG2PWbty36CNAYr/M5UVzUmELH2sGTyf2fKfNIUK\n" +
+        "Iya/NRxCqxLAc34NYH0YyGJ9VcDjbEMNSBAHIqDdBNqKUPnjn454yoivU2oEs294\n" +
+        "cGePMx3QLyPepMwUss8nW74yIF7vxfJ+KFDBGWNuZDRfXScsGIoeM0Vt9B+4fmnV\n" +
+        "nP4Dw6l3IwmQH4ppjg08qTKvyrXcF2dPDWa98Xw6bA5G085Z/b/6/6GpkvKx/q6i\n" +
+        "UqKwF7q5hkDcB+N4/5SgggN+MIIDejCCA3YwggJeoAMCAQICAWQwDQYJKoZIhvcN\n" +
+        "AQELBQAwLTEUMBIGA1UEChMLU29tZUNvbXBhbnkxFTATBgNVBAMTDFJvb3QgQ0Eg\n" +
+        "Q2VydDAeFw0xNjA4MDcyMTM3MTlaFw0xODA4MDcyMTM3MTlaMDUxFDASBgNVBAoT\n" +
+        "C1NvbWVDb21wYW55MR0wGwYDVQQDExRJbnRlcm1lZGlhdGUgQ0EgQ2VydDCCASIw\n" +
+        "DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJyUeQpxOxipUI4oBMUieoR7t9Np\n" +
+        "nND3AOkw4LCIrT2A/6/EQWwbhOdTkOyD+wF5nz1Fd//qTv7scepoGOTul3lJeymn\n" +
+        "YVT7T3C9AVVXrwkjnUzFWt4leM0aWgulMtqLlBZ2nypw7ZW4noIMhE1KDYFTSWAP\n" +
+        "S9FzYbUpxDaCxwuD6tL/DrDbbDlhUTYjEzgOPTTQwcPOVoD8hQMY6juM9CdM8XVq\n" +
+        "t1uK0jAfMa5Lpb9kb49xnH2CSv2m/FdSCejzFgqbowEmNwc72D5zewSrgY21iT4G\n" +
+        "XT2H19XMXhvNLtLTrjH1lojTjUjEgO5vct9OEANICqpaxRZ/VOIVPPZL9SMCAwEA\n" +
+        "AaOBmDCBlTAPBgNVHRMBAf8EBTADAQH/MDIGCCsGAQUFBwEBBCYwJDAiBggrBgEF\n" +
+        "BQcwAYYWaHR0cDovL2xvY2FsaG9zdDozOTEzNDAfBgNVHSMEGDAWgBSTTLHoxMiV\n" +
+        "AfbYlsnFXM76YjFUGTAdBgNVHQ4EFgQUYT525lwHCI4CmuWs8a7poaeKRJ4wDgYD\n" +
+        "VR0PAQH/BAQDAgGGMA0GCSqGSIb3DQEBCwUAA4IBAQBOJzhXVvToqz50b8YoUF2C\n" +
+        "/Qly7hkM+ba9F4DfMEmOlJ/W+gkYiu6G4CBoplXYb1AtanUXMCaoDnydv40ef+UK\n" +
+        "NE1afsMOHRzXVKI+97WoCe407tGTM+WXadLsHeEQ/7Mr03lXGz3N5uGsLYBL0YM6\n" +
+        "QzHEnij2ViJ5aO3256MCkgFAHzvHXtHA5MRAZMzyMxjbtuenHS2TqjivcCyfZkNM\n" +
+        "yoIv9jbJXTXNqZf+o5BqQOri+ZSbJn6PbA7rFjR1dWIIKow0NfYa3+NFbrgvRhZf\n" +
+        "6gFt5mqzLhM2PzYilVMbctatbOPEjoOS6BDww5G8oDreyAi9x2BtVbn4QtUNmGPX";
+
+    // OCSP Response Status: successful (0x0)
+    // Response Type: Basic OCSP Response
+    // Version: 1 (0x0)
+    // Responder Id: O = SomeCompany, CN = Root CA Cert
+    // Produced At: Sep  6 21:37:20 2016 GMT
+    // Responses:
+    // Certificate ID:
+    //   Hash Algorithm: sha1
+    //   Issuer Name Hash: C8ED9F4E9AC0052A978257C569E6A7C9C45F5CB5
+    //   Issuer Key Hash: 934CB1E8C4C89501F6D896C9C55CCEFA62315419
+    //   Serial Number: 64
+    // Cert Status: good
+    // This Update: Sep  6 21:37:20 2016 GMT
+    // Next Update: Sep  6 22:37:19 2016 GMT
+    private static final String INT_CA_OCSP_RESP =
+        "MIIFJQoBAKCCBR4wggUaBgkrBgEFBQcwAQEEggULMIIFBzCBrKEvMC0xFDASBgNV\n" +
+        "BAoTC1NvbWVDb21wYW55MRUwEwYDVQQDEwxSb290IENBIENlcnQYDzIwMTYwOTA2\n" +
+        "MjEzNzIwWjBkMGIwOjAJBgUrDgMCGgUABBTI7Z9OmsAFKpeCV8Vp5qfJxF9ctQQU\n" +
+        "k0yx6MTIlQH22JbJxVzO+mIxVBkCAWSAABgPMjAxNjA5MDYyMTM3MjBaoBEYDzIw\n" +
+        "MTYwOTA2MjIzNzE5WqECMAAwDQYJKoZIhvcNAQELBQADggEBAAgs8jpuEejPD8qO\n" +
+        "+xckvqMz/5pItOHaSB0xyPNpIapqjcDkLktJdBVq5XJWernO9DU+P7yr7TDbvo6h\n" +
+        "P5jBZklLz16Z1aRlEyow2jhelVjNl6nxoiij/6LOGK4tLHa8fK7hTB4Ykw22Bxzt\n" +
+        "LcbrU5jgUDhdZkTrs+rWM8nw7mVWIQYQfwzCMDZ5a02MxzhdwggJGRzqMrbhY/Q7\n" +
+        "RRUK3ohSgzHmLjVkvA0KeM/Px7EefzbEbww08fSsLybmBoIEbcckWSHkkXx4cuIR\n" +
+        "T9FiTz4Ms4r8qzPCo61qeklE2I5lfnfieROADV6sfwbul/0U1HqKhHVaxJ8yYw+T\n" +
+        "/FMxrUKgggNAMIIDPDCCAzgwggIgoAMCAQICAQEwDQYJKoZIhvcNAQELBQAwLTEU\n" +
+        "MBIGA1UEChMLU29tZUNvbXBhbnkxFTATBgNVBAMTDFJvb3QgQ0EgQ2VydDAeFw0x\n" +
+        "NjA3MDgyMTM3MThaFw0xOTA2MjgyMTM3MThaMC0xFDASBgNVBAoTC1NvbWVDb21w\n" +
+        "YW55MRUwEwYDVQQDEwxSb290IENBIENlcnQwggEiMA0GCSqGSIb3DQEBAQUAA4IB\n" +
+        "DwAwggEKAoIBAQCJTTN1mBKpFNnpVxGa1fUEg2wysMmixB2nyxXIh/BHaGoN6v+4\n" +
+        "xMxScSOyWfN9bXW1kAZuh4KPvKb3rThVtQXJC/HiI8jjjT9ginxWnjGqM7FotXIM\n" +
+        "Wvq46VP0XpHPswar78uEq/e08E+p0Ii5YIwtZwn0dUlaTudaqAwoUu5+/Oa7ChGc\n" +
+        "cP6fpJFVkmX31O8zfXOuOXD4P/y/5I4snijJGqrhkDmEuvIEIMvGGV0L9RN5f/Hv\n" +
+        "AotbNQ2AOcKQm2gaoE8POEa+M5VBEAYF80JUbfpj83mg6XRtRHhpF63HZGftBDBC\n" +
+        "6DlVzhJ+lTbM+r09yCq570AUpzdOsav4lsAtAgMBAAGjYzBhMA8GA1UdEwEB/wQF\n" +
+        "MAMBAf8wHwYDVR0jBBgwFoAUk0yx6MTIlQH22JbJxVzO+mIxVBkwHQYDVR0OBBYE\n" +
+        "FJNMsejEyJUB9tiWycVczvpiMVQZMA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0B\n" +
+        "AQsFAAOCAQEAAIvjZbMT/bdiIYmSB0SRkgWbkJVyI8GCMG6t2VnPwKWftKMbZew2\n" +
+        "EIubkTbfP6KXBjQh3CGNHxvd0m5A7m128T2AVug/0VI28+fWa8mj+cpueadTIx0z\n" +
+        "qsvgDPIONcTUyYpHN1FBV153JHhW2sIowrG+73+9aMMyrsYAV4vZ9a5l17Z3CqAP\n" +
+        "y61FV6FJSnn3YA57FLJd0NvXomxNx0qs4jDKADi5tI43pBRliIC3k7ckWEdXdHTW\n" +
+        "lMLB060KT48cVE59cbAD6Vyn8z57GAGXnommhO+RsG1pR86zYp78XWUHdM3LaXwS\n" +
+        "X1ag//pVgDZcPqzmiidhsgmiSDbMmiPyNg==";
+
+    // Do path validation as if it is always Tue, 06 Sep 2016 22:12:21 GMT
+    // This value is within the lifetimes of all certificates and both OCSP
+    // responses.
+    private static final Date EVAL_DATE = new Date(1473199941000L);
+
+    private static final Base64.Decoder DECODER = Base64.getMimeDecoder();
+
+    public static void main(String[] args) throws Exception {
+        TrustAnchor anchor;
+        CertificateFactory cf = CertificateFactory.getInstance("X.509");
+        X509Certificate rootCert = generateCertificate(cf, ROOT_CA_CERT);
+        X509Certificate eeCert = generateCertificate(cf, EE_CERT);
+        X509Certificate intCaCert = generateCertificate(cf, INT_CA_CERT);
+        List<X509Certificate> certList = new ArrayList<X509Certificate>() {{
+            add(eeCert);
+            add(intCaCert);
+        }};
+
+        System.out.println("==== Certificate Path =====");
+        for (X509Certificate c : certList) {
+            System.out.println(c + "\n");
+        }
+        System.out.println("===========================");
+
+        System.out.println("===== Test 1: TA(X509Certificate) =====");
+        anchor = new TrustAnchor(rootCert, null);
+        runTest(cf, certList, anchor);
+
+        System.out.println("===== Test 2: TA(X500Principal, PublicKey =====");
+        anchor = new TrustAnchor(rootCert.getSubjectX500Principal(),
+                rootCert.getPublicKey(), null);
+        runTest(cf, certList, anchor);
+
+        System.out.println("===== Test 3: TA(String, PublicKey =====");
+        anchor = new TrustAnchor(rootCert.getSubjectX500Principal().getName(),
+                rootCert.getPublicKey(), null);
+        runTest(cf, certList, anchor);
+    }
+
+    private static void runTest(CertificateFactory cf,
+            List<X509Certificate> certList, TrustAnchor anchor)
+            throws Exception {
+        CertPath path = cf.generateCertPath(certList);
+        CertPathValidator validator = CertPathValidator.getInstance("PKIX");
+
+        System.out.println(anchor);
+
+        // Attach the OCSP responses to a PKIXParameters object
+        PKIXRevocationChecker pkrev =
+                (PKIXRevocationChecker)validator.getRevocationChecker();
+        Map<X509Certificate, byte[]> responseMap = new HashMap<>();
+        responseMap.put(certList.get(0), DECODER.decode(EE_OCSP_RESP));
+        responseMap.put(certList.get(1), DECODER.decode(INT_CA_OCSP_RESP));
+        pkrev.setOcspResponses(responseMap);
+        PKIXParameters params =
+                new PKIXParameters(Collections.singleton(anchor));
+        params.addCertPathChecker(pkrev);
+        params.setDate(EVAL_DATE);
+
+        validator.validate(path, params);
+    }
+
+    private static X509Certificate generateCertificate(CertificateFactory cf,
+            String encoded) throws CertificateException {
+        ByteArrayInputStream is = new ByteArrayInputStream(encoded.getBytes());
+        return (X509Certificate)cf.generateCertificate(is);
+    }
+}
--- a/jdk/test/java/sql/testng/TEST.properties	Thu Sep 15 16:56:11 2016 -0400
+++ b/jdk/test/java/sql/testng/TEST.properties	Fri Sep 16 13:15:02 2016 -0700
@@ -1,3 +1,4 @@
 # JDBC unit tests uses TestNG
 TestNG.dirs = .
+othervm.dirs = test/sql/othervm
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/sql/testng/test/sql/othervm/DriverManagerInitTests.java	Fri Sep 16 13:15:02 2016 -0700
@@ -0,0 +1,84 @@
+/*
+ * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package test.sql.othervm;
+
+import java.io.BufferedReader;
+import java.io.CharArrayReader;
+import java.io.CharArrayWriter;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.sql.Driver;
+import java.sql.DriverManager;
+import java.util.Enumeration;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import static org.testng.Assert.*;
+import org.testng.annotations.Test;
+
+public class DriverManagerInitTests {
+
+    /**
+     * Validate that when DriverManager loads the initial JDBC drivers, that the
+     * output from DriverManager.println is available by verifying that the
+     * String "JDBC DriverManager initialized" is found
+     */
+    @Test
+    public void test() {
+
+        CharArrayWriter cw = new CharArrayWriter();
+        PrintWriter pw = new PrintWriter(cw);
+        DriverManager.setLogWriter(pw);
+        Enumeration<Driver> drivers = DriverManager.getDrivers();
+
+        try (BufferedReader reader = new BufferedReader(new CharArrayReader(cw.toCharArray()))) {
+            boolean result
+                    = reader.lines().anyMatch(
+                            line -> line.matches(".*JDBC DriverManager initialized.*"));
+            assertTrue(result);
+
+        } catch (IOException ex) {
+            Logger.getLogger(DriverManagerInitTests.class.getName()).log(Level.SEVERE, null, ex);
+            fail();
+        }
+
+        // Check to verify that we are not initializing a 2nd time
+        cw = new CharArrayWriter();
+        pw = new PrintWriter(cw);
+        DriverManager.setLogWriter(pw);
+        drivers = DriverManager.getDrivers();
+
+        try (BufferedReader reader = new BufferedReader(new CharArrayReader(cw.toCharArray()))) {
+            boolean result
+                    = reader.lines().noneMatch(
+                            line -> line.matches(".*JDBC DriverManager initialized.*"));
+            assertTrue(result);
+
+        } catch (IOException ex) {
+            Logger.getLogger(DriverManagerInitTests.class.getName()).log(Level.SEVERE, null, ex);
+            fail();
+        }
+
+    }
+
+}
--- a/jdk/test/java/text/Format/DateFormat/Bug4322313.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jdk/test/java/text/Format/DateFormat/Bug4322313.java	Fri Sep 16 13:15:02 2016 -0700
@@ -50,110 +50,110 @@
 
         Object[][] valids = {
           /* given ID      offset                format('z'), ('Z')    index */
-            {"GMT+03:04",  new Long(-184 * mpm), "GMT+03:04", "+0304", new Integer(9)},
-            {"GMT+13:42",  new Long(-822 * mpm), "GMT+13:42", "+1342", new Integer(9)},
-            {"GMT+00:00",  new Long(0),          "GMT+00:00", "+0000", new Integer(9)},
-            {"GMT+1:11",   new Long(-71 * mpm),  "GMT+01:11", "+0111", new Integer(8)},
-            {"GMT +13:42", new Long(0),          "GMT",       "+0000", new Integer(3)},
-            {" GMT",       new Long(0),          "GMT",       "+0000", new Integer(4)},
-            {"+0304",      new Long(-184 * mpm), "GMT+03:04", "+0304", new Integer(5)},
-            {"+1342",      new Long(-822 * mpm), "GMT+13:42", "+1342", new Integer(5)},
-            {"+0000",      new Long(0),          "GMT+00:00", "+0000", new Integer(5)},
-            {" +1342",     new Long(-822 * mpm), "GMT+13:42", "+1342", new Integer(6)},
+            {"GMT+03:04",  -184L * mpm, "GMT+03:04", "+0304", 9},
+            {"GMT+13:42",  -822L * mpm, "GMT+13:42", "+1342", 9},
+            {"GMT+00:00",   0L,         "GMT+00:00", "+0000", 9},
+            {"GMT+1:11",   -71L * mpm,  "GMT+01:11", "+0111", 8},
+            {"GMT +13:42",  0L,         "GMT",       "+0000", 3},
+            {" GMT",        0L,         "GMT",       "+0000", 4},
+            {"+0304",      -184L * mpm, "GMT+03:04", "+0304", 5},
+            {"+1342",      -822L * mpm, "GMT+13:42", "+1342", 5},
+            {"+0000",       0L,         "GMT+00:00", "+0000", 5},
+            {" +1342",     -822L * mpm, "GMT+13:42", "+1342", 6},
             /* ISO-LATIN-1 digits */
-            {"GMT+\u0030\u0031:\u0032\u0033", new Long(-83 * mpm), "GMT+01:23", "+0123", new Integer(9)},
+            {"GMT+\u0030\u0031:\u0032\u0033", -83L * mpm, "GMT+01:23", "+0123", 9},
 
            /* In fact, this test case is skipped because TimeZone class can't
             * recognize TimeZone IDs like "+00234" or "-00234".
             */
-            {"+00234",     new Long(-23 * mpm), "GMT+00:23", "+0023", new Integer(5)},
+            {"+00234",     -23L * mpm, "GMT+00:23", "+0023", 5},
 
-            {"GMT-03:04",  new Long(184 * mpm), "GMT-03:04", "-0304", new Integer(9)},
-            {"GMT-13:42",  new Long(822 * mpm), "GMT-13:42", "-1342", new Integer(9)},
-            {"GMT-00:00",  new Long(0),         "GMT+00:00", "+0000", new Integer(9)},
-            {"GMT-1:11",   new Long(71 * mpm),  "GMT-01:11", "-0111", new Integer(8)},
-            {"GMT -13:42", new Long(0),         "GMT",       "+0000", new Integer(3)},
-            {"-0304",      new Long(184 * mpm), "GMT-03:04", "-0304", new Integer(5)},
-            {"-1342",      new Long(822 * mpm), "GMT-13:42", "-1342", new Integer(5)},
-            {" -1342",     new Long(822 * mpm), "GMT-13:42", "-1342", new Integer(6)},
+            {"GMT-03:04",  184L * mpm, "GMT-03:04", "-0304", 9},
+            {"GMT-13:42",  822L * mpm, "GMT-13:42", "-1342", 9},
+            {"GMT-00:00",  0L,         "GMT+00:00", "+0000", 9},
+            {"GMT-1:11",   71L * mpm,  "GMT-01:11", "-0111", 8},
+            {"GMT -13:42", 0L,         "GMT",       "+0000", 3},
+            {"-0304",      184L * mpm, "GMT-03:04", "-0304", 5},
+            {"-1342",      822L * mpm, "GMT-13:42", "-1342", 5},
+            {" -1342",     822L * mpm, "GMT-13:42", "-1342", 6},
             /* ISO-LATIN-1 digits */
-            {"GMT-\u0030\u0031:\u0032\u0033", new Long(83 * mpm), "GMT-01:23", "-0123", new Integer(9)},
+            {"GMT-\u0030\u0031:\u0032\u0033", 83L * mpm, "GMT-01:23", "-0123", 9},
            /* In fact, this test case is skipped because TimeZone class can't
             * recognize TimeZone IDs like "+00234" or "-00234".
             */
-            {"-00234",     new Long(23 * mpm),  "GMT+00:23", "-0023", new Integer(5)},
+            {"-00234",     23L * mpm,  "GMT+00:23", "-0023", 5},
         };
 
         Object[][] invalids = {
           /* given ID       error index   */
-            {"GMT+8",       new Integer(5)},
-            {"GMT+18",      new Integer(6)},
-            {"GMT+208",     new Integer(6)},
-            {"GMT+0304",    new Integer(6)},
-            {"GMT+42195",   new Integer(5)},
-            {"GMT+5:8",     new Integer(7)},
-            {"GMT+23:60",   new Integer(8)},
-            {"GMT+11:1",    new Integer(8)},
-            {"GMT+24:13",   new Integer(5)},
-            {"GMT+421:950", new Integer(5)},
-            {"GMT+0a:0A",   new Integer(5)},
-            {"GMT+ 13:42",  new Integer(4)},
-            {"GMT+13 :42",  new Integer(6)},
-            {"GMT+13: 42",  new Integer(7)},
-            {"GMT+-13:42",  new Integer(4)},
-            {"G M T",       new Integer(0)},
-            {"+8",          new Integer(2)},
-            {"+18",         new Integer(3)},
-            {"+208",        new Integer(4)},
-            {"+2360",       new Integer(4)},
-            {"+2413",       new Integer(2)},
-            {"+42195",      new Integer(2)},
-            {"+0AbC",       new Integer(2)},
-            {"+ 1342",      new Integer(1)},
-            {"+-1342",      new Integer(1)},
-            {"1342",        new Integer(0)},
+            {"GMT+8",       5},
+            {"GMT+18",      6},
+            {"GMT+208",     6},
+            {"GMT+0304",    6},
+            {"GMT+42195",   5},
+            {"GMT+5:8",     7},
+            {"GMT+23:60",   8},
+            {"GMT+11:1",    8},
+            {"GMT+24:13",   5},
+            {"GMT+421:950", 5},
+            {"GMT+0a:0A",   5},
+            {"GMT+ 13:42",  4},
+            {"GMT+13 :42",  6},
+            {"GMT+13: 42",  7},
+            {"GMT+-13:42",  4},
+            {"G M T",       0},
+            {"+8",          2},
+            {"+18",         3},
+            {"+208",        4},
+            {"+2360",       4},
+            {"+2413",       2},
+            {"+42195",      2},
+            {"+0AbC",       2},
+            {"+ 1342",      1},
+            {"+-1342",      1},
+            {"1342",        0},
           /* Arabic-Indic digits */
-            {"GMT+\u0660\u0661:\u0662\u0663", new Integer(4)},
+            {"GMT+\u0660\u0661:\u0662\u0663", 4},
           /* Extended Arabic-Indic digits */
-            {"GMT+\u06f0\u06f1:\u06f2\u06f3", new Integer(4)},
+            {"GMT+\u06f0\u06f1:\u06f2\u06f3", 4},
           /* Devanagari digits */
-            {"GMT+\u0966\u0967:\u0968\u0969", new Integer(4)},
+            {"GMT+\u0966\u0967:\u0968\u0969", 4},
           /* Fullwidth digits */
-            {"GMT+\uFF10\uFF11:\uFF12\uFF13", new Integer(4)},
+            {"GMT+\uFF10\uFF11:\uFF12\uFF13", 4},
 
-            {"GMT-8",       new Integer(5)},
-            {"GMT-18",      new Integer(6)},
-            {"GMT-208",     new Integer(6)},
-            {"GMT-0304",    new Integer(6)},
-            {"GMT-42195",   new Integer(5)},
-            {"GMT-5:8",     new Integer(7)},
-            {"GMT-23:60",   new Integer(8)},
-            {"GMT-11:1",    new Integer(8)},
-            {"GMT-24:13",   new Integer(5)},
-            {"GMT-421:950", new Integer(5)},
-            {"GMT-0a:0A",   new Integer(5)},
-            {"GMT- 13:42",  new Integer(4)},
-            {"GMT-13 :42",  new Integer(6)},
-            {"GMT-13: 42",  new Integer(7)},
-            {"GMT-+13:42",  new Integer(4)},
-            {"-8",          new Integer(2)},
-            {"-18",         new Integer(3)},
-            {"-208",        new Integer(4)},
-            {"-2360",       new Integer(4)},
-            {"-2413",       new Integer(2)},
-            {"-42195",      new Integer(2)},
-            {"-0AbC",       new Integer(2)},
-            {"- 1342",      new Integer(1)},
-            {"--1342",      new Integer(1)},
-            {"-802",        new Integer(2)},
+            {"GMT-8",       5},
+            {"GMT-18",      6},
+            {"GMT-208",     6},
+            {"GMT-0304",    6},
+            {"GMT-42195",   5},
+            {"GMT-5:8",     7},
+            {"GMT-23:60",   8},
+            {"GMT-11:1",    8},
+            {"GMT-24:13",   5},
+            {"GMT-421:950", 5},
+            {"GMT-0a:0A",   5},
+            {"GMT- 13:42",  4},
+            {"GMT-13 :42",  6},
+            {"GMT-13: 42",  7},
+            {"GMT-+13:42",  4},
+            {"-8",          2},
+            {"-18",         3},
+            {"-208",        4},
+            {"-2360",       4},
+            {"-2413",       2},
+            {"-42195",      2},
+            {"-0AbC",       2},
+            {"- 1342",      1},
+            {"--1342",      1},
+            {"-802",        2},
           /* Arabic-Indic digits */
-            {"GMT-\u0660\u0661:\u0662\u0663", new Integer(4)},
+            {"GMT-\u0660\u0661:\u0662\u0663", 4},
           /* Extended Arabic-Indic digits */
-            {"GMT-\u06f0\u06f1:\u06f2\u06f3", new Integer(4)},
+            {"GMT-\u06f0\u06f1:\u06f2\u06f3", 4},
           /* Devanagari digits */
-            {"GMT-\u0966\u0967:\u0968\u0969", new Integer(4)},
+            {"GMT-\u0966\u0967:\u0968\u0969", 4},
           /* Fullwidth digits */
-            {"GMT-\uFF10\uFF11:\uFF12\uFF13", new Integer(4)},
+            {"GMT-\uFF10\uFF11:\uFF12\uFF13", 4},
         };
 
         try {
--- a/jdk/test/java/text/Format/DateFormat/Bug4736959.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jdk/test/java/text/Format/DateFormat/Bug4736959.java	Fri Sep 16 13:15:02 2016 -0700
@@ -30,6 +30,7 @@
 import java.text.*;
 import java.util.*;
 
+@SuppressWarnings("deprecation")
 public class Bug4736959 {
     /**
      * 4736959: JSpinner won't work for AM/PM field
--- a/jdk/test/java/text/Format/DateFormat/Bug4823811.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jdk/test/java/text/Format/DateFormat/Bug4823811.java	Fri Sep 16 13:15:02 2016 -0700
@@ -685,8 +685,8 @@
         testNumberFormatFormatting(nfEG, -456, "456-", "ar_EG");
 
         System.out.println("*** DecimalFormat.parse test in ar_EG");
-        testNumberFormatParsing(nfEG, "123-", new Long(-123), "ar_EG");
-        testNumberFormatParsing(nfEG, "123--", new Long(-123), "ar_EG");
+        testNumberFormatParsing(nfEG, "123-", -123L, "ar_EG");
+        testNumberFormatParsing(nfEG, "123--",-123L, "ar_EG");
         testNumberFormatParsingCheckException(nfEG, "-123", 0, "ar_EG");
 
         System.out.println("*** DecimalFormat.format test in en_US");
@@ -694,8 +694,8 @@
         testNumberFormatFormatting(nfUS, -456, "-456", "en_US");
 
         System.out.println("*** DecimalFormat.parse test in en_US");
-        testNumberFormatParsing(nfUS, "123-", new Long(123), "en_US");
-        testNumberFormatParsing(nfUS, "-123", new Long(-123), "en_US");
+        testNumberFormatParsing(nfUS, "123-", 123L, "en_US");
+        testNumberFormatParsing(nfUS, "-123",-123L, "en_US");
         testNumberFormatParsingCheckException(nfUS, "--123", 0, "en_US");
     }
 
--- a/jdk/test/java/text/Format/DateFormat/Bug4845901.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jdk/test/java/text/Format/DateFormat/Bug4845901.java	Fri Sep 16 13:15:02 2016 -0700
@@ -55,6 +55,7 @@
         }
     }
 
+    @SuppressWarnings("deprecation")
     static void testParse(SimpleDateFormat sdf, String str, int expectedHour) {
         try {
             Date parsedDate = sdf.parse(str);
--- a/jdk/test/java/text/Format/DateFormat/Bug6609750.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jdk/test/java/text/Format/DateFormat/Bug6609750.java	Fri Sep 16 13:15:02 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -37,6 +37,7 @@
         Locale defaultLocale = Locale.getDefault();
         Locale.setDefault(Locale.US);
 
+        @SuppressWarnings("deprecation")
         Date[] dates = {
             new Date(9-1900,     Calendar.JUNE, 12),
             new Date(99-1900,    Calendar.JUNE, 12),
--- a/jdk/test/java/text/Format/DateFormat/Bug6683975.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jdk/test/java/text/Format/DateFormat/Bug6683975.java	Fri Sep 16 13:15:02 2016 -0700
@@ -66,6 +66,7 @@
             System.err.println("\tth_TH: " + str_th_TH);
         }
 
+        @SuppressWarnings("deprecation")
         Date date = new Date(2008-1900, Calendar.SEPTEMBER, 30, 8, 0, 0);
         str_th = df_th.format(date);
         if (!expected_th[style].equals(str_th)) {
--- a/jdk/test/java/text/Format/DateFormat/DateFormatRegression.java	Thu Sep 15 16:56:11 2016 -0400
+++ b/jdk/test/java/text/Format/DateFormat/DateFormatRegression.java	Fri Sep 16 13:15:02 2016 -0700
@@ -41,7 +41,7 @@
     }
 
     public void Test4029195() {
-
+        @SuppressWarnings("deprecation")
         Date today = new Date();
 
         logln("today: " + today);
@@ -74,19 +74,20 @@
     public void Test4052408() {
         DateFormat fmt = DateFormat.getDateTimeInstance(DateFormat.SHORT,
                                                         DateFormat.SHORT, Locale.US);
+        @SuppressWarnings("deprecation")
         Date date = new Date(97, Calendar.MAY, 3, 8, 55);
         String str;
         logln(str = fmt.format(date));
 
         if (!str.equals("5/3/97 8:55 AM"))
             errln("Fail: Test broken; Want 5/3/97 8:55 AM Got " + str);
-        Hashtable expected = new Hashtable();
-        expected.put(new Integer(DateFormat.MONTH_FIELD), "5");
-        expected.put(new Integer(DateFormat.DATE_FIELD), "3");
-        expected.put(new Integer(DateFormat.YEAR_FIELD), "97");
-        expected.put(new Integer(DateFormat.HOUR1_FIELD), "8");
-        expected.put(new Integer(DateFormat.MINUTE_FIELD), "55");
-        expected.put(new Integer(DateFormat.AM_PM_FIELD), "AM");
+        Map<Integer,String> expected = new HashMap<>();
+        expected.put(DateFormat.MONTH_FIELD, "5");
+        expected.put(DateFormat.DATE_FIELD, "3");
+        expected.put(DateFormat.YEAR_FIELD, "97");
+        expected.put(DateFormat.HOUR1_FIELD, "8");
+        expected.put(DateFormat.MINUTE_FIELD, "55");
+        expected.put(DateFormat.AM_PM_FIELD, "AM");
 
         StringBuffer buf = new StringBuffer();
         String fieldNames[] = {
@@ -120,7 +121,7 @@
                              ", \"" + str + "\", " +
                              pos.getBeginIndex() + ", " +
                              pos.getEndIndex());
-            String exp = (String) expected.get(new Integer(i));
+            String exp = expected.get(i);
             if ((exp == null && str.length() == 0) ||