Index: modules/text/src/main/java/java/text/CharacterIterator.java =================================================================== --- modules/text/src/main/java/java/text/CharacterIterator.java (revision 471994) +++ modules/text/src/main/java/java/text/CharacterIterator.java (working copy) @@ -27,7 +27,7 @@ /** * A constant which indicates there is no character. */ - public static char DONE = '\uffff'; + public static final char DONE = '\uffff'; /** * Answers a new CharacterIterator with the same properties. Index: modules/sql/src/main/java/java/sql/ResultSetMetaData.java =================================================================== --- modules/sql/src/main/java/java/sql/ResultSetMetaData.java (revision 471994) +++ modules/sql/src/main/java/java/sql/ResultSetMetaData.java (working copy) @@ -25,17 +25,17 @@ /** * Indicates that a column cannot contain NULL values */ - public static int columnNoNulls = 0; + public static final int columnNoNulls = 0; /** * Indicates that a column can contain NULL values */ - public static int columnNullable = 1; + public static final int columnNullable = 1; /** * Indicates that it is unknown whether a column can contain NULLs or not */ - public static int columnNullableUnknown = 2; + public static final int columnNullableUnknown = 2; /** * Returns the title of indexed columns catalog Index: modules/luni/src/main/java/java/net/SocketOptions.java =================================================================== --- modules/luni/src/main/java/java/net/SocketOptions.java (revision 471994) +++ modules/luni/src/main/java/java/net/SocketOptions.java (working copy) @@ -23,31 +23,31 @@ */ public interface SocketOptions { - public static int SO_LINGER = 128; + public static final int SO_LINGER = 128; - public static int SO_TIMEOUT = 4102; + public static final int SO_TIMEOUT = 4102; - public static int TCP_NODELAY = 1; + public static final int TCP_NODELAY = 1; // For 5 and 6 see MulticastSocket // For 7 see PlainDatagramSocketImpl - public static int IP_MULTICAST_IF = 16; + public static final int IP_MULTICAST_IF = 16; - public static int SO_BINDADDR = 15; + public static final int SO_BINDADDR = 15; - public static int SO_REUSEADDR = 4; + public static final int SO_REUSEADDR = 4; // 10 not currently used - public static int SO_SNDBUF = 4097; + public static final int SO_SNDBUF = 4097; - public static int SO_RCVBUF = 4098; + public static final int SO_RCVBUF = 4098; // For 13, see DatagramSocket - public static int SO_KEEPALIVE = 8; + public static final int SO_KEEPALIVE = 8; public static final int IP_TOS = 3;