Skip to content

Commit 51a5731

Browse files
committed
8277016: Use blessed modifier order in jdk.httpserver
Reviewed-by: dfuchs
1 parent c4b4432 commit 51a5731

File tree

5 files changed

+17
-17
lines changed

5 files changed

+17
-17
lines changed

src/jdk.httpserver/share/classes/sun/net/httpserver/ChunkedInputStream.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,12 @@ class ChunkedInputStream extends LeftOverInputStream {
4141

4242
private boolean needToReadHeader = true;
4343

44-
final static char CR = '\r';
45-
final static char LF = '\n';
44+
static final char CR = '\r';
45+
static final char LF = '\n';
4646
/*
4747
* Maximum chunk header size of 2KB + 2 bytes for CRLF
4848
*/
49-
private final static int MAX_CHUNK_HEADER_SIZE = 2050;
49+
private static final int MAX_CHUNK_HEADER_SIZE = 2050;
5050

5151
private int numeric (char[] arr, int nchars) throws IOException {
5252
assert arr.length >= nchars;

src/jdk.httpserver/share/classes/sun/net/httpserver/ChunkedOutputStream.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@ class ChunkedOutputStream extends FilterOutputStream
5151
{
5252
private boolean closed = false;
5353
/* max. amount of user data per chunk */
54-
final static int CHUNK_SIZE = 4096;
54+
static final int CHUNK_SIZE = 4096;
5555
/* allow 4 bytes for chunk-size plus 4 for CRLFs */
56-
final static int OFFSET = 6; /* initial <=4 bytes for len + CRLF */
56+
static final int OFFSET = 6; /* initial <=4 bytes for len + CRLF */
5757
private int pos = OFFSET;
5858
private int count = 0;
5959
private byte[] buf = new byte [CHUNK_SIZE+OFFSET+2];

src/jdk.httpserver/share/classes/sun/net/httpserver/Request.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@
3636
*/
3737
class Request {
3838

39-
final static int BUF_LEN = 2048;
40-
final static byte CR = 13;
41-
final static byte LF = 10;
39+
static final int BUF_LEN = 2048;
40+
static final byte CR = 13;
41+
static final byte LF = 10;
4242

4343
private String startLine;
4444
private SocketChannel chan;
@@ -230,7 +230,7 @@ static class ReadStream extends InputStream {
230230
int readlimit;
231231
static long readTimeout;
232232
ServerImpl server;
233-
final static int BUFSIZE = 8 * 1024;
233+
static final int BUFSIZE = 8 * 1024;
234234

235235
public ReadStream (ServerImpl server, SocketChannel chan) throws IOException {
236236
this.channel = chan;

src/jdk.httpserver/share/classes/sun/net/httpserver/ServerImpl.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -75,13 +75,13 @@ class ServerImpl implements TimeSource {
7575
private volatile long ticks; /* number of clock ticks since server started */
7676
private HttpServer wrapper;
7777

78-
final static int CLOCK_TICK = ServerConfig.getClockTick();
79-
final static long IDLE_INTERVAL = ServerConfig.getIdleInterval();
80-
final static int MAX_IDLE_CONNECTIONS = ServerConfig.getMaxIdleConnections();
81-
final static long TIMER_MILLIS = ServerConfig.getTimerMillis ();
82-
final static long MAX_REQ_TIME=getTimeMillis(ServerConfig.getMaxReqTime());
83-
final static long MAX_RSP_TIME=getTimeMillis(ServerConfig.getMaxRspTime());
84-
final static boolean timer1Enabled = MAX_REQ_TIME != -1 || MAX_RSP_TIME != -1;
78+
static final int CLOCK_TICK = ServerConfig.getClockTick();
79+
static final long IDLE_INTERVAL = ServerConfig.getIdleInterval();
80+
static final int MAX_IDLE_CONNECTIONS = ServerConfig.getMaxIdleConnections();
81+
static final long TIMER_MILLIS = ServerConfig.getTimerMillis ();
82+
static final long MAX_REQ_TIME=getTimeMillis(ServerConfig.getMaxReqTime());
83+
static final long MAX_RSP_TIME=getTimeMillis(ServerConfig.getMaxRspTime());
84+
static final boolean timer1Enabled = MAX_REQ_TIME != -1 || MAX_RSP_TIME != -1;
8585

8686
private Timer timer, timer1;
8787
private final Logger logger;

src/jdk.httpserver/share/classes/sun/net/httpserver/simpleserver/SimpleFileServerImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ static int start(PrintWriter writer, String[] args) {
144144
return Startup.OK.statusCode;
145145
}
146146

147-
private final static class Out {
147+
private static final class Out {
148148
private final PrintWriter writer;
149149
private Out() { throw new AssertionError(); }
150150

0 commit comments

Comments
 (0)