--- a/jdk/src/java.base/share/classes/sun/security/util/DerValue.java	Wed Sep 16 08:24:40 2015 -0400
+++ b/jdk/src/java.base/share/classes/sun/security/util/DerValue.java	Tue Sep 15 21:56:04 2015 -0700
@@ -84,52 +84,52 @@
      */
 
     /** Tag value indicating an ASN.1 "BOOLEAN" value. */
-    public final static byte    tag_Boolean = 0x01;
+    public static final byte    tag_Boolean = 0x01;
 
     /** Tag value indicating an ASN.1 "INTEGER" value. */
-    public final static byte    tag_Integer = 0x02;
+    public static final byte    tag_Integer = 0x02;
 
     /** Tag value indicating an ASN.1 "BIT STRING" value. */
-    public final static byte    tag_BitString = 0x03;
+    public static final byte    tag_BitString = 0x03;
 
     /** Tag value indicating an ASN.1 "OCTET STRING" value. */
-    public final static byte    tag_OctetString = 0x04;
+    public static final byte    tag_OctetString = 0x04;
 
     /** Tag value indicating an ASN.1 "NULL" value. */
-    public final static byte    tag_Null = 0x05;
+    public static final byte    tag_Null = 0x05;
 
     /** Tag value indicating an ASN.1 "OBJECT IDENTIFIER" value. */
-    public final static byte    tag_ObjectId = 0x06;
+    public static final byte    tag_ObjectId = 0x06;
 
     /** Tag value including an ASN.1 "ENUMERATED" value */
-    public final static byte    tag_Enumerated = 0x0A;
+    public static final byte    tag_Enumerated = 0x0A;
 
     /** Tag value indicating an ASN.1 "UTF8String" value. */
-    public final static byte    tag_UTF8String = 0x0C;
+    public static final byte    tag_UTF8String = 0x0C;
 
     /** Tag value including a "printable" string */
-    public final static byte    tag_PrintableString = 0x13;
+    public static final byte    tag_PrintableString = 0x13;
 
     /** Tag value including a "teletype" string */
-    public final static byte    tag_T61String = 0x14;
+    public static final byte    tag_T61String = 0x14;
 
     /** Tag value including an ASCII string */
-    public final static byte    tag_IA5String = 0x16;
+    public static final byte    tag_IA5String = 0x16;
 
     /** Tag value indicating an ASN.1 "UTCTime" value. */
-    public final static byte    tag_UtcTime = 0x17;
+    public static final byte    tag_UtcTime = 0x17;
 
     /** Tag value indicating an ASN.1 "GeneralizedTime" value. */
-    public final static byte    tag_GeneralizedTime = 0x18;
+    public static final byte    tag_GeneralizedTime = 0x18;
 
     /** Tag value indicating an ASN.1 "GenerallString" value. */
-    public final static byte    tag_GeneralString = 0x1B;
+    public static final byte    tag_GeneralString = 0x1B;
 
     /** Tag value indicating an ASN.1 "UniversalString" value. */
-    public final static byte    tag_UniversalString = 0x1C;
+    public static final byte    tag_UniversalString = 0x1C;
 
     /** Tag value indicating an ASN.1 "BMPString" value. */
-    public final static byte    tag_BMPString = 0x1E;
+    public static final byte    tag_BMPString = 0x1E;
 
     // CONSTRUCTED seq/set
 
@@ -137,25 +137,25 @@
      * Tag value indicating an ASN.1
      * "SEQUENCE" (zero to N elements, order is significant).
      */
-    public final static byte    tag_Sequence = 0x30;
+    public static final byte    tag_Sequence = 0x30;
 
     /**
      * Tag value indicating an ASN.1
      * "SEQUENCE OF" (one to N elements, order is significant).
      */
-    public final static byte    tag_SequenceOf = 0x30;
+    public static final byte    tag_SequenceOf = 0x30;
 
     /**
      * Tag value indicating an ASN.1
      * "SET" (zero to N members, order does not matter).
      */
-    public final static byte    tag_Set = 0x31;
+    public static final byte    tag_Set = 0x31;
 
     /**
      * Tag value indicating an ASN.1
      * "SET OF" (one to N members, order does not matter).
      */
-    public final static byte    tag_SetOf = 0x31;
+    public static final byte    tag_SetOf = 0x31;
 
     /*
      * These values are the high order bits for the other kinds of tags.