--- a/jdk/test/java/io/Serializable/subclass/XObjectInputStream.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/test/java/io/Serializable/subclass/XObjectInputStream.java	Tue Sep 15 21:56:04 2015 -0700
@@ -37,12 +37,12 @@
             dis = new DataInputStream(in);
         }
 
-    final public void defaultReadObject()
+    public final void defaultReadObject()
         throws IOException, ClassNotFoundException, NotActiveException
     {
     }
 
-    final protected Object readObjectOverride()
+    protected final Object readObjectOverride()
         throws OptionalDataException, ClassNotFoundException, IOException {
 
         Object readResult = null;
@@ -256,7 +256,7 @@
      * Set the accessible flag on it here. ObjectOutputStream
      * will call it as necessary.
      */
-    static public Method getReadObjectMethod(final Class cl) {
+    public static Method getReadObjectMethod(final Class cl) {
 
         Method readObjectMethod = (Method)
             java.security.AccessController.doPrivileged
@@ -286,7 +286,7 @@
     /*************************************************************/
 
     /* taken verbatim from ObjectInputStream. */
-    static private void invokeMethod(final Object obj, final Method m,
+    private static void invokeMethod(final Object obj, final Method m,
                                         final Object[] argList)
         throws IOException
     {