Merge
authoramurillo
Wed, 31 Aug 2016 13:50:02 -0700
changeset 40694 759341b4bd03
parent 40693 364c71c3a981 (current diff)
parent 40684 2e37c119dc2a (diff)
child 40695 7996b10bce66
Merge
--- a/jdk/test/java/lang/Class/GetModuleTest.java	Wed Aug 31 09:22:54 2016 -0700
+++ b/jdk/test/java/lang/Class/GetModuleTest.java	Wed Aug 31 13:50:02 2016 -0700
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
--- a/jdk/test/java/lang/Class/GetPackageTest.java	Wed Aug 31 09:22:54 2016 -0700
+++ b/jdk/test/java/lang/Class/GetPackageTest.java	Wed Aug 31 13:50:02 2016 -0700
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
--- a/jdk/test/java/lang/ClassLoader/GetSystemPackage.java	Wed Aug 31 09:22:54 2016 -0700
+++ b/jdk/test/java/lang/ClassLoader/GetSystemPackage.java	Wed Aug 31 13:50:02 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 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
--- a/jdk/test/java/lang/ClassLoader/deadlock/GetResource.java	Wed Aug 31 09:22:54 2016 -0700
+++ b/jdk/test/java/lang/ClassLoader/deadlock/GetResource.java	Wed Aug 31 13:50:02 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 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
--- a/jdk/test/java/lang/ProcessBuilder/CloseRace.java	Wed Aug 31 09:22:54 2016 -0700
+++ b/jdk/test/java/lang/ProcessBuilder/CloseRace.java	Wed Aug 31 13:50:02 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2014, 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
--- a/jdk/test/java/lang/ProcessBuilder/PipelineTest.java	Wed Aug 31 09:22:54 2016 -0700
+++ b/jdk/test/java/lang/ProcessBuilder/PipelineTest.java	Wed Aug 31 13:50:02 2016 -0700
@@ -19,7 +19,6 @@
  * 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.File;
--- a/jdk/test/java/lang/StackWalker/CountLocalSlots.java	Wed Aug 31 09:22:54 2016 -0700
+++ b/jdk/test/java/lang/StackWalker/CountLocalSlots.java	Wed Aug 31 13:50:02 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+ * 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
--- a/jdk/test/java/lang/StackWalker/LocalsAndOperands.java	Wed Aug 31 09:22:54 2016 -0700
+++ b/jdk/test/java/lang/StackWalker/LocalsAndOperands.java	Wed Aug 31 13:50:02 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 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
--- a/jdk/test/java/lang/StackWalker/LocalsCrash.java	Wed Aug 31 09:22:54 2016 -0700
+++ b/jdk/test/java/lang/StackWalker/LocalsCrash.java	Wed Aug 31 13:50:02 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+ * 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
--- a/jdk/test/java/lang/String/concat/CompactStringsInitialCoder.java	Wed Aug 31 09:22:54 2016 -0700
+++ b/jdk/test/java/lang/String/concat/CompactStringsInitialCoder.java	Wed Aug 31 13:50:02 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2016, Oracle and/or its affiliates. All rights reserved.
+ * 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
--- a/jdk/test/java/lang/String/concat/StringConcatFactoryEmptyMethods.java	Wed Aug 31 09:22:54 2016 -0700
+++ b/jdk/test/java/lang/String/concat/StringConcatFactoryEmptyMethods.java	Wed Aug 31 13:50:02 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2016, Oracle and/or its affiliates. All rights reserved.
+ * 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
--- a/jdk/test/java/lang/String/concat/WithSecurityManager.java	Wed Aug 31 09:22:54 2016 -0700
+++ b/jdk/test/java/lang/String/concat/WithSecurityManager.java	Wed Aug 31 13:50:02 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2016, Oracle and/or its affiliates. All rights reserved.
+ * 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
--- a/jdk/test/java/lang/Thread/ThreadStateController.java	Wed Aug 31 09:22:54 2016 -0700
+++ b/jdk/test/java/lang/Thread/ThreadStateController.java	Wed Aug 31 13:50:02 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
--- a/jdk/test/java/lang/annotation/typeAnnotations/GetAnnotatedReceiverType.java	Wed Aug 31 09:22:54 2016 -0700
+++ b/jdk/test/java/lang/annotation/typeAnnotations/GetAnnotatedReceiverType.java	Wed Aug 31 13:50:02 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2014, 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
--- a/jdk/test/java/lang/instrument/NMTHelper.java	Wed Aug 31 09:22:54 2016 -0700
+++ b/jdk/test/java/lang/instrument/NMTHelper.java	Wed Aug 31 13:50:02 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
--- a/jdk/test/java/lang/invoke/6987555/Test6987555.java	Wed Aug 31 09:22:54 2016 -0700
+++ b/jdk/test/java/lang/invoke/6987555/Test6987555.java	Wed Aug 31 13:50:02 2016 -0700
@@ -19,7 +19,6 @@
  * 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.
- *
  */
 
 /**
--- a/jdk/test/java/lang/invoke/6991596/Test6991596.java	Wed Aug 31 09:22:54 2016 -0700
+++ b/jdk/test/java/lang/invoke/6991596/Test6991596.java	Wed Aug 31 13:50:02 2016 -0700
@@ -19,7 +19,6 @@
  * 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.
- *
  */
 
 /**
--- a/jdk/test/java/lang/invoke/6998541/Test6998541.java	Wed Aug 31 09:22:54 2016 -0700
+++ b/jdk/test/java/lang/invoke/6998541/Test6998541.java	Wed Aug 31 13:50:02 2016 -0700
@@ -19,7 +19,6 @@
  * 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.
- *
  */
 
 /**
--- a/jdk/test/java/lang/invoke/7087570/Test7087570.java	Wed Aug 31 09:22:54 2016 -0700
+++ b/jdk/test/java/lang/invoke/7087570/Test7087570.java	Wed Aug 31 13:50:02 2016 -0700
@@ -19,7 +19,6 @@
  * 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
--- a/jdk/test/java/lang/invoke/7157574/Test7157574.java	Wed Aug 31 09:22:54 2016 -0700
+++ b/jdk/test/java/lang/invoke/7157574/Test7157574.java	Wed Aug 31 13:50:02 2016 -0700
@@ -19,7 +19,6 @@
  * 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.
- *
  */
 
 /*
--- a/jdk/test/java/lang/invoke/7196190/ClassForNameTest.java	Wed Aug 31 09:22:54 2016 -0700
+++ b/jdk/test/java/lang/invoke/7196190/ClassForNameTest.java	Wed Aug 31 13:50:02 2016 -0700
@@ -19,7 +19,6 @@
  * 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.
- *
  */
 
 /**
--- a/jdk/test/java/lang/invoke/7196190/GetUnsafeTest.java	Wed Aug 31 09:22:54 2016 -0700
+++ b/jdk/test/java/lang/invoke/7196190/GetUnsafeTest.java	Wed Aug 31 13:50:02 2016 -0700
@@ -19,7 +19,6 @@
  * 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.
- *
  */
 
 /**
--- a/jdk/test/java/lang/invoke/8009222/Test8009222.java	Wed Aug 31 09:22:54 2016 -0700
+++ b/jdk/test/java/lang/invoke/8009222/Test8009222.java	Wed Aug 31 13:50:02 2016 -0700
@@ -19,7 +19,6 @@
  * 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.
- *
  */
 
 /**
--- a/jdk/test/java/lang/invoke/8022701/BogoLoader.java	Wed Aug 31 09:22:54 2016 -0700
+++ b/jdk/test/java/lang/invoke/8022701/BogoLoader.java	Wed Aug 31 13:50:02 2016 -0700
@@ -19,7 +19,6 @@
  * 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.BufferedInputStream;
--- a/jdk/test/java/lang/invoke/8022701/InvokeSeveralWays.java	Wed Aug 31 09:22:54 2016 -0700
+++ b/jdk/test/java/lang/invoke/8022701/InvokeSeveralWays.java	Wed Aug 31 13:50:02 2016 -0700
@@ -19,7 +19,6 @@
  * 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.lang.reflect.InvocationTargetException;
--- a/jdk/test/java/lang/invoke/8022701/Invoker.java	Wed Aug 31 09:22:54 2016 -0700
+++ b/jdk/test/java/lang/invoke/8022701/Invoker.java	Wed Aug 31 13:50:02 2016 -0700
@@ -19,7 +19,6 @@
  * 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.
- *
  */
 
 public class Invoker {
--- a/jdk/test/java/lang/invoke/8022701/MHIllegalAccess.java	Wed Aug 31 09:22:54 2016 -0700
+++ b/jdk/test/java/lang/invoke/8022701/MHIllegalAccess.java	Wed Aug 31 13:50:02 2016 -0700
@@ -19,7 +19,6 @@
  * 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.
- *
  */
 
 /**
--- a/jdk/test/java/lang/invoke/8022701/MethodSupplier.java	Wed Aug 31 09:22:54 2016 -0700
+++ b/jdk/test/java/lang/invoke/8022701/MethodSupplier.java	Wed Aug 31 13:50:02 2016 -0700
@@ -19,7 +19,6 @@
  * 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.
- *
  */
 
 /*
--- a/jdk/test/java/lang/invoke/CallSiteTest.java	Wed Aug 31 09:22:54 2016 -0700
+++ b/jdk/test/java/lang/invoke/CallSiteTest.java	Wed Aug 31 13:50:02 2016 -0700
@@ -19,7 +19,6 @@
  * 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.
- *
  */
 
 /**
--- a/jdk/test/java/lang/invoke/CallStaticInitOrder.java	Wed Aug 31 09:22:54 2016 -0700
+++ b/jdk/test/java/lang/invoke/CallStaticInitOrder.java	Wed Aug 31 13:50:02 2016 -0700
@@ -19,7 +19,6 @@
  * 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.
- *
  */
 
 /**
--- a/jdk/test/java/lang/invoke/ProtectedMemberDifferentPackage/Test.java	Wed Aug 31 09:22:54 2016 -0700
+++ b/jdk/test/java/lang/invoke/ProtectedMemberDifferentPackage/Test.java	Wed Aug 31 13:50:02 2016 -0700
@@ -19,7 +19,6 @@
  * 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.
- *
  */
 
 /**
--- a/jdk/test/java/lang/invoke/ProtectedMemberDifferentPackage/p1/T2.java	Wed Aug 31 09:22:54 2016 -0700
+++ b/jdk/test/java/lang/invoke/ProtectedMemberDifferentPackage/p1/T2.java	Wed Aug 31 13:50:02 2016 -0700
@@ -19,8 +19,8 @@
  * 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 p1;
 
 import p2.T3;
--- a/jdk/test/java/lang/invoke/ProtectedMemberDifferentPackage/p2/T3.java	Wed Aug 31 09:22:54 2016 -0700
+++ b/jdk/test/java/lang/invoke/ProtectedMemberDifferentPackage/p2/T3.java	Wed Aug 31 13:50:02 2016 -0700
@@ -19,8 +19,8 @@
  * 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 p2;
 
 import p1.T2;
--- a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeBoolean.java	Wed Aug 31 09:22:54 2016 -0700
+++ b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeBoolean.java	Wed Aug 31 13:50:02 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 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
--- a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeByte.java	Wed Aug 31 09:22:54 2016 -0700
+++ b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeByte.java	Wed Aug 31 13:50:02 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 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
--- a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeChar.java	Wed Aug 31 09:22:54 2016 -0700
+++ b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeChar.java	Wed Aug 31 13:50:02 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 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
--- a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeDouble.java	Wed Aug 31 09:22:54 2016 -0700
+++ b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeDouble.java	Wed Aug 31 13:50:02 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 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
--- a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeFloat.java	Wed Aug 31 09:22:54 2016 -0700
+++ b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeFloat.java	Wed Aug 31 13:50:02 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 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
--- a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeInt.java	Wed Aug 31 09:22:54 2016 -0700
+++ b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeInt.java	Wed Aug 31 13:50:02 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 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
--- a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeLong.java	Wed Aug 31 09:22:54 2016 -0700
+++ b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeLong.java	Wed Aug 31 13:50:02 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 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
--- a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeShort.java	Wed Aug 31 09:22:54 2016 -0700
+++ b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeShort.java	Wed Aug 31 13:50:02 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 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
--- a/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeString.java	Wed Aug 31 09:22:54 2016 -0700
+++ b/jdk/test/java/lang/invoke/VarHandles/VarHandleTestMethodTypeString.java	Wed Aug 31 13:50:02 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 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
--- a/jdk/test/java/lang/invoke/accessProtectedSuper/BogoLoader.java	Wed Aug 31 09:22:54 2016 -0700
+++ b/jdk/test/java/lang/invoke/accessProtectedSuper/BogoLoader.java	Wed Aug 31 13:50:02 2016 -0700
@@ -19,7 +19,6 @@
  * 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.BufferedInputStream;
--- a/jdk/test/java/lang/invoke/accessProtectedSuper/MethodInvoker.java	Wed Aug 31 09:22:54 2016 -0700
+++ b/jdk/test/java/lang/invoke/accessProtectedSuper/MethodInvoker.java	Wed Aug 31 13:50:02 2016 -0700
@@ -19,7 +19,6 @@
  * 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 anotherpkg.MethodSupplierOuter;
--- a/jdk/test/java/lang/invoke/accessProtectedSuper/Test.java	Wed Aug 31 09:22:54 2016 -0700
+++ b/jdk/test/java/lang/invoke/accessProtectedSuper/Test.java	Wed Aug 31 13:50:02 2016 -0700
@@ -19,7 +19,6 @@
  * 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.
- *
  */
 
 /**
--- a/jdk/test/java/lang/invoke/accessProtectedSuper/anotherpkg/MethodSupplierOuter.java	Wed Aug 31 09:22:54 2016 -0700
+++ b/jdk/test/java/lang/invoke/accessProtectedSuper/anotherpkg/MethodSupplierOuter.java	Wed Aug 31 13:50:02 2016 -0700
@@ -19,7 +19,6 @@
  * 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 anotherpkg;
--- a/jdk/test/java/lang/management/GarbageCollectorMXBean/GcInfoCompositeType.java	Wed Aug 31 09:22:54 2016 -0700
+++ b/jdk/test/java/lang/management/GarbageCollectorMXBean/GcInfoCompositeType.java	Wed Aug 31 13:50:02 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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
--- a/jdk/test/java/net/Inet4Address/textToNumericFormat.java	Wed Aug 31 09:22:54 2016 -0700
+++ b/jdk/test/java/net/Inet4Address/textToNumericFormat.java	Wed Aug 31 13:50:02 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 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
--- a/jdk/test/java/net/ProxySelector/B8035158.java	Wed Aug 31 09:22:54 2016 -0700
+++ b/jdk/test/java/net/ProxySelector/B8035158.java	Wed Aug 31 13:50:02 2016 -0700
@@ -20,6 +20,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 /*
  * @test
  * @bug 8035158 8145732
--- a/jdk/test/java/net/URLClassLoader/definePackage/SplitPackage.java	Wed Aug 31 09:22:54 2016 -0700
+++ b/jdk/test/java/net/URLClassLoader/definePackage/SplitPackage.java	Wed Aug 31 13:50:02 2016 -0700
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
--- a/jdk/test/java/net/URLPermission/nstest/LookupTest.java	Wed Aug 31 09:22:54 2016 -0700
+++ b/jdk/test/java/net/URLPermission/nstest/LookupTest.java	Wed Aug 31 13:50:02 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
--- a/jdk/test/java/net/httpclient/BasicAuthTest.java	Wed Aug 31 09:22:54 2016 -0700
+++ b/jdk/test/java/net/httpclient/BasicAuthTest.java	Wed Aug 31 13:50:02 2016 -0700
@@ -20,6 +20,7 @@
  *
  * 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.
  */
 
 /**
--- a/jdk/test/java/net/httpclient/HeadersTest1.java	Wed Aug 31 09:22:54 2016 -0700
+++ b/jdk/test/java/net/httpclient/HeadersTest1.java	Wed Aug 31 13:50:02 2016 -0700
@@ -20,6 +20,7 @@
  *
  * 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.
  */
 
 /**
--- a/jdk/test/java/net/httpclient/ImmutableHeaders.java	Wed Aug 31 09:22:54 2016 -0700
+++ b/jdk/test/java/net/httpclient/ImmutableHeaders.java	Wed Aug 31 13:50:02 2016 -0700
@@ -20,6 +20,7 @@
  *
  * 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.
  */
 
 /**
--- a/jdk/test/java/net/httpclient/security/Driver.java	Wed Aug 31 09:22:54 2016 -0700
+++ b/jdk/test/java/net/httpclient/security/Driver.java	Wed Aug 31 13:50:02 2016 -0700
@@ -20,6 +20,7 @@
  *
  * 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.
  */
 
 /**
--- a/jdk/test/java/net/httpclient/security/Security.java	Wed Aug 31 09:22:54 2016 -0700
+++ b/jdk/test/java/net/httpclient/security/Security.java	Wed Aug 31 13:50:02 2016 -0700
@@ -20,6 +20,7 @@
  *
  * 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.
  */
 
 /**
--- a/jdk/test/java/util/Arrays/Correct.java	Wed Aug 31 09:22:54 2016 -0700
+++ b/jdk/test/java/util/Arrays/Correct.java	Wed Aug 31 13:50:02 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2014 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2014, 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
--- a/jdk/test/java/util/Map/FunctionalCMEs.java	Wed Aug 31 09:22:54 2016 -0700
+++ b/jdk/test/java/util/Map/FunctionalCMEs.java	Wed Aug 31 13:50:02 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015 Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -22,6 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 import java.util.Arrays;
 import java.util.ConcurrentModificationException;
 import java.util.HashMap;
--- a/jdk/test/java/util/Objects/CheckIndex.java	Wed Aug 31 09:22:54 2016 -0700
+++ b/jdk/test/java/util/Objects/CheckIndex.java	Wed Aug 31 13:50:02 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 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
--- a/jdk/test/java/util/concurrent/FutureTask/NegativeTimeout.java	Wed Aug 31 09:22:54 2016 -0700
+++ b/jdk/test/java/util/concurrent/FutureTask/NegativeTimeout.java	Wed Aug 31 13:50:02 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 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
--- a/jdk/test/java/util/logging/Logger/entering/LoggerEnteringWithParams.java	Wed Aug 31 09:22:54 2016 -0700
+++ b/jdk/test/java/util/logging/Logger/entering/LoggerEnteringWithParams.java	Wed Aug 31 13:50:02 2016 -0700
@@ -1,4 +1,3 @@
-
 /*
  * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
--- a/jdk/test/java/util/logging/XMLFormatterDate.java	Wed Aug 31 09:22:54 2016 -0700
+++ b/jdk/test/java/util/logging/XMLFormatterDate.java	Wed Aug 31 13:50:02 2016 -0700
@@ -1,4 +1,3 @@
-
 /*
  * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -21,6 +20,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
+
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
--- a/jdk/test/java/util/regex/PatternStreamTest.java	Wed Aug 31 09:22:54 2016 -0700
+++ b/jdk/test/java/util/regex/PatternStreamTest.java	Wed Aug 31 13:50:02 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
--- a/jdk/test/java/util/zip/TestCRC32.java	Wed Aug 31 09:22:54 2016 -0700
+++ b/jdk/test/java/util/zip/TestCRC32.java	Wed Aug 31 13:50:02 2016 -0700
@@ -1,6 +1,3 @@
-
-import java.util.zip.CRC32;
-
 /*
  * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -24,6 +21,8 @@
  * questions.
  */
 
+import java.util.zip.CRC32;
+
 /**
  * @test @summary Check that CRC-32 returns the expected CRC value for the
  * string 123456789
--- a/jdk/test/java/util/zip/TestCRC32C.java	Wed Aug 31 09:22:54 2016 -0700
+++ b/jdk/test/java/util/zip/TestCRC32C.java	Wed Aug 31 13:50:02 2016 -0700
@@ -1,6 +1,3 @@
-
-import java.util.zip.CRC32C;
-
 /*
  * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -24,6 +21,8 @@
  * questions.
  */
 
+import java.util.zip.CRC32C;
+
 /**
  * @test @summary Check that CRC-32C returns the expected CRC value for the
  * string 123456789
--- a/jdk/test/java/util/zip/ZipFile/TestZipFile.java	Wed Aug 31 09:22:54 2016 -0700
+++ b/jdk/test/java/util/zip/ZipFile/TestZipFile.java	Wed Aug 31 13:50:02 2016 -0700
@@ -8,7 +8,7 @@
  *
  * 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
+ * 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).
  *