--- a/jdk/src/java.base/share/classes/java/io/ObjectStreamConstants.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/java/io/ObjectStreamConstants.java	Tue Sep 15 21:56:04 2015 -0700
@@ -36,12 +36,12 @@
     /**
      * Magic number that is written to the stream header.
      */
-    final static short STREAM_MAGIC = (short)0xaced;
+    static final short STREAM_MAGIC = (short)0xaced;
 
     /**
      * Version number that is written to the stream header.
      */
-    final static short STREAM_VERSION = 5;
+    static final short STREAM_VERSION = 5;
 
     /* Each item in the stream is preceded by a tag
      */
@@ -49,95 +49,95 @@
     /**
      * First tag value.
      */
-    final static byte TC_BASE = 0x70;
+    static final byte TC_BASE = 0x70;
 
     /**
      * Null object reference.
      */
-    final static byte TC_NULL =         (byte)0x70;
+    static final byte TC_NULL =         (byte)0x70;
 
     /**
      * Reference to an object already written into the stream.
      */
-    final static byte TC_REFERENCE =    (byte)0x71;
+    static final byte TC_REFERENCE =    (byte)0x71;
 
     /**
      * new Class Descriptor.
      */
-    final static byte TC_CLASSDESC =    (byte)0x72;
+    static final byte TC_CLASSDESC =    (byte)0x72;
 
     /**
      * new Object.
      */
-    final static byte TC_OBJECT =       (byte)0x73;
+    static final byte TC_OBJECT =       (byte)0x73;
 
     /**
      * new String.
      */
-    final static byte TC_STRING =       (byte)0x74;
+    static final byte TC_STRING =       (byte)0x74;
 
     /**
      * new Array.
      */
-    final static byte TC_ARRAY =        (byte)0x75;
+    static final byte TC_ARRAY =        (byte)0x75;
 
     /**
      * Reference to Class.
      */
-    final static byte TC_CLASS =        (byte)0x76;
+    static final byte TC_CLASS =        (byte)0x76;
 
     /**
      * Block of optional data. Byte following tag indicates number
      * of bytes in this block data.
      */
-    final static byte TC_BLOCKDATA =    (byte)0x77;
+    static final byte TC_BLOCKDATA =    (byte)0x77;
 
     /**
      * End of optional block data blocks for an object.
      */
-    final static byte TC_ENDBLOCKDATA = (byte)0x78;
+    static final byte TC_ENDBLOCKDATA = (byte)0x78;
 
     /**
      * Reset stream context. All handles written into stream are reset.
      */
-    final static byte TC_RESET =        (byte)0x79;
+    static final byte TC_RESET =        (byte)0x79;
 
     /**
      * long Block data. The long following the tag indicates the
      * number of bytes in this block data.
      */
-    final static byte TC_BLOCKDATALONG= (byte)0x7A;
+    static final byte TC_BLOCKDATALONG= (byte)0x7A;
 
     /**
      * Exception during write.
      */
-    final static byte TC_EXCEPTION =    (byte)0x7B;
+    static final byte TC_EXCEPTION =    (byte)0x7B;
 
     /**
      * Long string.
      */
-    final static byte TC_LONGSTRING =   (byte)0x7C;
+    static final byte TC_LONGSTRING =   (byte)0x7C;
 
     /**
      * new Proxy Class Descriptor.
      */
-    final static byte TC_PROXYCLASSDESC =       (byte)0x7D;
+    static final byte TC_PROXYCLASSDESC =       (byte)0x7D;
 
     /**
      * new Enum constant.
      * @since 1.5
      */
-    final static byte TC_ENUM =         (byte)0x7E;
+    static final byte TC_ENUM =         (byte)0x7E;
 
     /**
      * Last tag value.
      */
-    final static byte TC_MAX =          (byte)0x7E;
+    static final byte TC_MAX =          (byte)0x7E;
 
     /**
      * First wire handle to be assigned.
      */
-    final static int baseWireHandle = 0x7e0000;
+    static final int baseWireHandle = 0x7e0000;
 
 
     /******************************************************/
@@ -147,7 +147,7 @@
      * Bit mask for ObjectStreamClass flag. Indicates a Serializable class
      * defines its own writeObject method.
      */
-    final static byte SC_WRITE_METHOD = 0x01;
+    static final byte SC_WRITE_METHOD = 0x01;
 
     /**
      * Bit mask for ObjectStreamClass flag. Indicates Externalizable data
@@ -157,23 +157,23 @@
      * @see #PROTOCOL_VERSION_2
      * @since 1.2
      */
-    final static byte SC_BLOCK_DATA = 0x08;
+    static final byte SC_BLOCK_DATA = 0x08;
 
     /**
      * Bit mask for ObjectStreamClass flag. Indicates class is Serializable.
      */
-    final static byte SC_SERIALIZABLE = 0x02;
+    static final byte SC_SERIALIZABLE = 0x02;
 
     /**
      * Bit mask for ObjectStreamClass flag. Indicates class is Externalizable.
      */
-    final static byte SC_EXTERNALIZABLE = 0x04;
+    static final byte SC_EXTERNALIZABLE = 0x04;
 
     /**
      * Bit mask for ObjectStreamClass flag. Indicates class is an enum type.
      * @since 1.5
      */
-    final static byte SC_ENUM = 0x10;
+    static final byte SC_ENUM = 0x10;
 
 
     /* *******************************************************************/
@@ -187,7 +187,7 @@
      * @see java.io.ObjectInputStream#enableResolveObject(boolean)
      * @since 1.2
      */
-    final static SerializablePermission SUBSTITUTION_PERMISSION =
+    static final SerializablePermission SUBSTITUTION_PERMISSION =
                            new SerializablePermission("enableSubstitution");
 
     /**
@@ -197,7 +197,7 @@
      * @see java.io.ObjectInputStream#readObjectOverride()
      * @since 1.2
      */
-    final static SerializablePermission SUBCLASS_IMPLEMENTATION_PERMISSION =
+    static final SerializablePermission SUBCLASS_IMPLEMENTATION_PERMISSION =
                     new SerializablePermission("enableSubclassImplementation");
    /**
     * A Stream Protocol Version. <p>
@@ -210,7 +210,7 @@
     * @see java.io.ObjectOutputStream#useProtocolVersion(int)
     * @since 1.2
     */
-    public final static int PROTOCOL_VERSION_1 = 1;
+    public static final int PROTOCOL_VERSION_1 = 1;
 
 
    /**
@@ -231,5 +231,5 @@
     * @see #SC_BLOCK_DATA
     * @since 1.2
     */
-    public final static int PROTOCOL_VERSION_2 = 2;
+    public static final int PROTOCOL_VERSION_2 = 2;
 }