This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new db76f15c93 Clean-up, formatting. No functional change.
db76f15c93 is described below
commit db76f15c93c6fcdfa86bcc3f70c14177967e9f01
Author: Mark Thomas <[email protected]>
AuthorDate: Fri May 5 16:46:12 2023 +0100
Clean-up, formatting. No functional change.
Preparation before back-porting RFC 918 priorities.
---
java/org/apache/coyote/http2/AbstractStream.java | 4 ++--
java/org/apache/coyote/http2/ConnectionSettingsBase.java | 10 +++++-----
.../org/apache/coyote/http2/ConnectionSettingsLocal.java | 2 +-
java/org/apache/coyote/http2/HpackEncoder.java | 8 ++++----
java/org/apache/coyote/http2/Http2Protocol.java | 2 +-
java/org/apache/coyote/http2/Http2UpgradeHandler.java | 16 ++++++++--------
java/org/apache/coyote/http2/Stream.java | 10 +++++-----
java/org/apache/coyote/http2/StreamProcessor.java | 6 +++---
8 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/java/org/apache/coyote/http2/AbstractStream.java
b/java/org/apache/coyote/http2/AbstractStream.java
index 2da3a63fb5..0cc5dc3e2a 100644
--- a/java/org/apache/coyote/http2/AbstractStream.java
+++ b/java/org/apache/coyote/http2/AbstractStream.java
@@ -37,8 +37,8 @@ abstract class AbstractStream {
private final String idAsString;
private volatile AbstractStream parentStream = null;
- private final Set<AbstractNonZeroStream> childStreams = Collections
- .newSetFromMap(new ConcurrentHashMap<AbstractNonZeroStream,
Boolean>());
+ private final Set<AbstractNonZeroStream> childStreams =
+ Collections.newSetFromMap(new
ConcurrentHashMap<AbstractNonZeroStream,Boolean>());
private long windowSize =
ConnectionSettingsBase.DEFAULT_INITIAL_WINDOW_SIZE;
private volatile int connectionAllocationRequested = 0;
diff --git a/java/org/apache/coyote/http2/ConnectionSettingsBase.java
b/java/org/apache/coyote/http2/ConnectionSettingsBase.java
index 8860a1fead..af1128be2b 100644
--- a/java/org/apache/coyote/http2/ConnectionSettingsBase.java
+++ b/java/org/apache/coyote/http2/ConnectionSettingsBase.java
@@ -45,8 +45,8 @@ abstract class ConnectionSettingsBase<T extends Throwable> {
static final int DEFAULT_MAX_FRAME_SIZE = MIN_MAX_FRAME_SIZE;
static final long DEFAULT_MAX_HEADER_LIST_SIZE = 1 << 15;
- Map<Setting, Long> current = new ConcurrentHashMap<>();
- Map<Setting, Long> pending = new ConcurrentHashMap<>();
+ Map<Setting,Long> current = new ConcurrentHashMap<>();
+ Map<Setting,Long> pending = new ConcurrentHashMap<>();
ConnectionSettingsBase(String connectionId) {
@@ -203,9 +203,9 @@ abstract class ConnectionSettingsBase<T extends Throwable> {
private void validateMaxFrameSize(long maxFrameSize) throws T {
if (maxFrameSize < MIN_MAX_FRAME_SIZE || maxFrameSize >
MAX_MAX_FRAME_SIZE) {
- String msg =
sm.getString("connectionSettings.maxFrameSizeInvalid", connectionId,
- Long.toString(maxFrameSize),
Integer.toString(MIN_MAX_FRAME_SIZE),
- Integer.toString(MAX_MAX_FRAME_SIZE));
+ String msg =
+ sm.getString("connectionSettings.maxFrameSizeInvalid",
connectionId, Long.toString(maxFrameSize),
+ Integer.toString(MIN_MAX_FRAME_SIZE),
Integer.toString(MAX_MAX_FRAME_SIZE));
throwException(msg, Http2Error.PROTOCOL_ERROR);
}
}
diff --git a/java/org/apache/coyote/http2/ConnectionSettingsLocal.java
b/java/org/apache/coyote/http2/ConnectionSettingsLocal.java
index 8fecf37136..372be80223 100644
--- a/java/org/apache/coyote/http2/ConnectionSettingsLocal.java
+++ b/java/org/apache/coyote/http2/ConnectionSettingsLocal.java
@@ -61,7 +61,7 @@ class ConnectionSettingsLocal extends
ConnectionSettingsBase<IllegalArgumentExce
// Stream is zero
// Payload
int pos = 9;
- for (Map.Entry<Setting, Long> setting : pending.entrySet()) {
+ for (Map.Entry<Setting,Long> setting : pending.entrySet()) {
ByteUtil.setTwoBytes(result, pos, setting.getKey().getId());
pos += 2;
ByteUtil.setFourBytes(result, pos, setting.getValue().longValue());
diff --git a/java/org/apache/coyote/http2/HpackEncoder.java
b/java/org/apache/coyote/http2/HpackEncoder.java
index 4b51fbe8a6..34f90e70f9 100644
--- a/java/org/apache/coyote/http2/HpackEncoder.java
+++ b/java/org/apache/coyote/http2/HpackEncoder.java
@@ -76,14 +76,14 @@ class HpackEncoder {
private int newMaxHeaderSize = -1; // if the max header size has been
changed
private int minNewMaxHeaderSize = -1; // records the smallest value of
newMaxHeaderSize, as per section 4.1
- private static final Map<String, TableEntry[]> ENCODING_STATIC_TABLE;
+ private static final Map<String,TableEntry[]> ENCODING_STATIC_TABLE;
private final Deque<TableEntry> evictionQueue = new ArrayDeque<>();
- private final Map<String, List<TableEntry>> dynamicTable = new
HashMap<>(); // TODO: use a custom data structure to
-
// reduce allocations
+ private final Map<String,List<TableEntry>> dynamicTable = new HashMap<>();
// TODO: use a custom data structure to
+
// reduce allocations
static {
- Map<String, TableEntry[]> map = new HashMap<>();
+ Map<String,TableEntry[]> map = new HashMap<>();
for (int i = 1; i < Hpack.STATIC_TABLE.length; ++i) {
Hpack.HeaderField m = Hpack.STATIC_TABLE[i];
TableEntry[] existing = map.get(m.name);
diff --git a/java/org/apache/coyote/http2/Http2Protocol.java
b/java/org/apache/coyote/http2/Http2Protocol.java
index bc7f71e1af..bfcf50a977 100644
--- a/java/org/apache/coyote/http2/Http2Protocol.java
+++ b/java/org/apache/coyote/http2/Http2Protocol.java
@@ -92,7 +92,7 @@ public class Http2Protocol implements UpgradeProtocol {
// change the default defined in ConnectionSettingsBase.
private int initialWindowSize =
ConnectionSettingsBase.DEFAULT_INITIAL_WINDOW_SIZE;
// Limits
- private Set<String> allowedTrailerHeaders = Collections.newSetFromMap(new
ConcurrentHashMap<String, Boolean>());
+ private Set<String> allowedTrailerHeaders = Collections.newSetFromMap(new
ConcurrentHashMap<String,Boolean>());
private int maxHeaderCount = Constants.DEFAULT_MAX_HEADER_COUNT;
private int maxHeaderSize = Constants.DEFAULT_MAX_HEADER_SIZE;
private int maxTrailerCount = Constants.DEFAULT_MAX_TRAILER_COUNT;
diff --git a/java/org/apache/coyote/http2/Http2UpgradeHandler.java
b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
index f82e47a388..061f5607bf 100644
--- a/java/org/apache/coyote/http2/Http2UpgradeHandler.java
+++ b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
@@ -121,7 +121,7 @@ class Http2UpgradeHandler extends AbstractStream implements
InternalHttpUpgradeH
private long readTimeout = Http2Protocol.DEFAULT_READ_TIMEOUT;
private long keepAliveTimeout = Http2Protocol.DEFAULT_KEEP_ALIVE_TIMEOUT;
private long writeTimeout = Http2Protocol.DEFAULT_WRITE_TIMEOUT;
- private final ConcurrentNavigableMap<Integer, AbstractNonZeroStream>
streams = new ConcurrentSkipListMap<>();
+ private final ConcurrentNavigableMap<Integer,AbstractNonZeroStream>
streams = new ConcurrentSkipListMap<>();
protected final AtomicInteger activeRemoteStreamCount = new
AtomicInteger(0);
// Start at -1 so the 'add 2' logic in closeIdleStreams() works
private volatile int maxActiveRemoteStreamId = -1;
@@ -129,8 +129,8 @@ class Http2UpgradeHandler extends AbstractStream implements
InternalHttpUpgradeH
private final AtomicInteger nextLocalStreamId = new AtomicInteger(2);
private final PingManager pingManager = new PingManager();
private volatile int newStreamsSinceLastPrune = 0;
- private final Set<AbstractStream> backLogStreams = Collections
- .newSetFromMap(new ConcurrentHashMap<AbstractStream, Boolean>());
+ private final Set<AbstractStream> backLogStreams =
+ Collections.newSetFromMap(new
ConcurrentHashMap<AbstractStream,Boolean>());
private long backLogSize = 0;
// The time at which the connection will timeout unless data arrives before
// then. -1 means no timeout.
@@ -1724,8 +1724,8 @@ class Http2UpgradeHandler extends AbstractStream
implements InternalHttpUpgradeH
@Override
public void receivedEndOfStream(int streamId) throws ConnectionException {
- AbstractNonZeroStream abstractNonZeroStream =
getAbstractNonZeroStream(streamId,
- connectionState.get().isNewStreamAllowed());
+ AbstractNonZeroStream abstractNonZeroStream =
+ getAbstractNonZeroStream(streamId,
connectionState.get().isNewStreamAllowed());
if (abstractNonZeroStream instanceof Stream) {
Stream stream = (Stream) abstractNonZeroStream;
stream.receivedEndOfStream();
@@ -1775,7 +1775,7 @@ class Http2UpgradeHandler extends AbstractStream
implements InternalHttpUpgradeH
private void closeIdleStreams(int newMaxActiveRemoteStreamId) {
- final ConcurrentNavigableMap<Integer, AbstractNonZeroStream> subMap =
streams.subMap(
+ final ConcurrentNavigableMap<Integer,AbstractNonZeroStream> subMap =
streams.subMap(
Integer.valueOf(maxActiveRemoteStreamId), false,
Integer.valueOf(newMaxActiveRemoteStreamId), false);
for (AbstractNonZeroStream stream : subMap.values()) {
if (stream instanceof Stream) {
@@ -1835,8 +1835,8 @@ class Http2UpgradeHandler extends AbstractStream
implements InternalHttpUpgradeH
@Override
public void headersEnd(int streamId) throws Http2Exception {
- AbstractNonZeroStream abstractNonZeroStream =
getAbstractNonZeroStream(streamId,
- connectionState.get().isNewStreamAllowed());
+ AbstractNonZeroStream abstractNonZeroStream =
+ getAbstractNonZeroStream(streamId,
connectionState.get().isNewStreamAllowed());
if (abstractNonZeroStream instanceof Stream) {
setMaxProcessedStream(streamId);
Stream stream = (Stream) abstractNonZeroStream;
diff --git a/java/org/apache/coyote/http2/Stream.java
b/java/org/apache/coyote/http2/Stream.java
index 178abe7b76..97bf8656af 100644
--- a/java/org/apache/coyote/http2/Stream.java
+++ b/java/org/apache/coyote/http2/Stream.java
@@ -115,8 +115,8 @@ class Stream extends AbstractNonZeroStream implements
HeaderEmitter {
} else {
// HTTP/2 Push or HTTP/1.1 upgrade
this.coyoteRequest = coyoteRequest;
- this.inputBuffer = new SavedRequestStreamInputBuffer(
- (SavedRequestInputFilter) coyoteRequest.getInputBuffer());
+ this.inputBuffer =
+ new
SavedRequestStreamInputBuffer((SavedRequestInputFilter)
coyoteRequest.getInputBuffer());
// Headers have been read by this point
state.receivedStartOfHeaders();
if (HTTP_UPGRADE_STREAM.equals(identifier)) {
@@ -694,9 +694,9 @@ class Stream extends AbstractNonZeroStream implements
HeaderEmitter {
inputBuffer.swallowUnread();
}
} catch (IOException ioe) {
- ConnectionException ce = new ConnectionException(
- sm.getString("stream.reset.fail", getConnectionId(),
getIdAsString()),
- Http2Error.PROTOCOL_ERROR, ioe);
+ ConnectionException ce =
+ new
ConnectionException(sm.getString("stream.reset.fail", getConnectionId(),
getIdAsString()),
+ Http2Error.PROTOCOL_ERROR, ioe);
handler.closeConnection(ce);
}
} else {
diff --git a/java/org/apache/coyote/http2/StreamProcessor.java
b/java/org/apache/coyote/http2/StreamProcessor.java
index 75bf5490d4..f9dfefc8f0 100644
--- a/java/org/apache/coyote/http2/StreamProcessor.java
+++ b/java/org/apache/coyote/http2/StreamProcessor.java
@@ -91,9 +91,9 @@ class StreamProcessor extends AbstractProcessor {
// fully read. This typically occurs when Tomcat
rejects an upload
// of some form (e.g. PUT or POST). Need to tell
the client not to
// send any more data on this stream (reset).
- StreamException se = new
StreamException(sm.getString("streamProcessor.cancel",
- stream.getConnectionId(),
stream.getIdAsString()), Http2Error.NO_ERROR,
- stream.getIdAsInt());
+ StreamException se =
+ new
StreamException(sm.getString("streamProcessor.cancel", stream.getConnectionId(),
+ stream.getIdAsString()),
Http2Error.NO_ERROR, stream.getIdAsInt());
stream.close(se);
} else if (!getErrorState().isConnectionIoAllowed()) {
ConnectionException ce = new ConnectionException(
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
