From ae840db2ccde12eeac25f43326389411718247c1 Mon Sep 17 00:00:00 2001 From: Huei Feng <695979933@qq.com> Date: Thu, 30 Jul 2020 06:00:23 +0800 Subject: [PATCH] Add a readonly modifier to a missing readonly field (#24379) --- .../Kestrel/Core/src/Internal/Http3/Http3Connection.cs | 2 +- .../Kestrel/Core/src/Internal/Http3/Http3ControlStream.cs | 4 ++-- .../Kestrel/Core/src/Internal/Http3/Http3Stream.cs | 4 ++-- .../Core/src/Internal/Http3/QPack/DecoderStreamReader.cs | 2 +- .../Core/src/Internal/Http3/QPack/EncoderStreamReader.cs | 8 ++++---- .../Kestrel/Core/src/Internal/Infrastructure/Heartbeat.cs | 2 +- .../src/Internal/Infrastructure/ThreadPoolAwaitable.cs | 2 +- .../Core/src/Internal/KestrelServerOptionsSetup.cs | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/Servers/Kestrel/Core/src/Internal/Http3/Http3Connection.cs b/src/Servers/Kestrel/Core/src/Internal/Http3/Http3Connection.cs index b0c85bfcdf..20a500a355 100644 --- a/src/Servers/Kestrel/Core/src/Internal/Http3/Http3Connection.cs +++ b/src/Servers/Kestrel/Core/src/Internal/Http3/Http3Connection.cs @@ -32,7 +32,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http3 private long _highestOpenedStreamId; // TODO lock to access private volatile bool _haveSentGoAway; private readonly object _sync = new object(); - private MultiplexedConnectionContext _multiplexedContext; + private readonly MultiplexedConnectionContext _multiplexedContext; private readonly Http3ConnectionContext _context; private readonly ISystemClock _systemClock; private readonly TimeoutControl _timeoutControl; diff --git a/src/Servers/Kestrel/Core/src/Internal/Http3/Http3ControlStream.cs b/src/Servers/Kestrel/Core/src/Internal/Http3/Http3ControlStream.cs index 0c89d21c0d..a8b0d8d7bc 100644 --- a/src/Servers/Kestrel/Core/src/Internal/Http3/Http3ControlStream.cs +++ b/src/Servers/Kestrel/Core/src/Internal/Http3/Http3ControlStream.cs @@ -20,9 +20,9 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http3 private const int EncoderStream = 2; private const int DecoderStream = 3; - private Http3FrameWriter _frameWriter; + private readonly Http3FrameWriter _frameWriter; private readonly Http3Connection _http3Connection; - private HttpConnectionContext _context; + private readonly HttpConnectionContext _context; private readonly Http3RawFrame _incomingFrame = new Http3RawFrame(); private volatile int _isClosed; private int _gracefulCloseInitiator; diff --git a/src/Servers/Kestrel/Core/src/Internal/Http3/Http3Stream.cs b/src/Servers/Kestrel/Core/src/Internal/Http3/Http3Stream.cs index c4004372bf..d8530a577a 100644 --- a/src/Servers/Kestrel/Core/src/Internal/Http3/Http3Stream.cs +++ b/src/Servers/Kestrel/Core/src/Internal/Http3/Http3Stream.cs @@ -32,8 +32,8 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http3 private static ReadOnlySpan TrailersBytes => new byte[8] { (byte)'t', (byte)'r', (byte)'a', (byte)'i', (byte)'l', (byte)'e', (byte)'r', (byte)'s' }; private static ReadOnlySpan ConnectBytes => new byte[7] { (byte)'C', (byte)'O', (byte)'N', (byte)'N', (byte)'E', (byte)'C', (byte)'T' }; - private Http3FrameWriter _frameWriter; - private Http3OutputProducer _http3Output; + private readonly Http3FrameWriter _frameWriter; + private readonly Http3OutputProducer _http3Output; private int _isClosed; private int _gracefulCloseInitiator; private readonly Http3StreamContext _context; diff --git a/src/Servers/Kestrel/Core/src/Internal/Http3/QPack/DecoderStreamReader.cs b/src/Servers/Kestrel/Core/src/Internal/Http3/QPack/DecoderStreamReader.cs index 6b53b79900..621714dac1 100644 --- a/src/Servers/Kestrel/Core/src/Internal/Http3/QPack/DecoderStreamReader.cs +++ b/src/Servers/Kestrel/Core/src/Internal/Http3/QPack/DecoderStreamReader.cs @@ -43,7 +43,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http3.QPack private const byte InsertCountIncrementPrefixMask = 0x3F; private const int InsertCountIncrementPrefix = 6; - private IntegerDecoder _integerDecoder = new IntegerDecoder(); + private readonly IntegerDecoder _integerDecoder = new IntegerDecoder(); private State _state; public DecoderStreamReader() diff --git a/src/Servers/Kestrel/Core/src/Internal/Http3/QPack/EncoderStreamReader.cs b/src/Servers/Kestrel/Core/src/Internal/Http3/QPack/EncoderStreamReader.cs index b235415902..2fd44021d3 100644 --- a/src/Servers/Kestrel/Core/src/Internal/Http3/QPack/EncoderStreamReader.cs +++ b/src/Servers/Kestrel/Core/src/Internal/Http3/QPack/EncoderStreamReader.cs @@ -76,15 +76,15 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http3.QPack private const byte HuffmanMask = 0x80; private bool _s; - private byte[] _stringOctets; - private byte[] _headerNameOctets; - private byte[] _headerValueOctets; + private readonly byte[] _stringOctets; + private readonly byte[] _headerNameOctets; + private readonly byte[] _headerValueOctets; private byte[] _headerName; private int _headerNameLength; private int _headerValueLength; private int _stringLength; private int _stringIndex; - private DynamicTable _dynamicTable = new DynamicTable(1000); // TODO figure out architecture. + private readonly DynamicTable _dynamicTable = new DynamicTable(1000); // TODO figure out architecture. private readonly IntegerDecoder _integerDecoder = new IntegerDecoder(); private State _state = State.Ready; diff --git a/src/Servers/Kestrel/Core/src/Internal/Infrastructure/Heartbeat.cs b/src/Servers/Kestrel/Core/src/Internal/Infrastructure/Heartbeat.cs index e26a2961cb..0e42007907 100644 --- a/src/Servers/Kestrel/Core/src/Internal/Infrastructure/Heartbeat.cs +++ b/src/Servers/Kestrel/Core/src/Internal/Infrastructure/Heartbeat.cs @@ -16,7 +16,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure private readonly IDebugger _debugger; private readonly IKestrelTrace _trace; private readonly TimeSpan _interval; - private Thread _timerThread; + private readonly Thread _timerThread; private volatile bool _stopped; public Heartbeat(IHeartbeatHandler[] callbacks, ISystemClock systemClock, IDebugger debugger, IKestrelTrace trace) diff --git a/src/Servers/Kestrel/Core/src/Internal/Infrastructure/ThreadPoolAwaitable.cs b/src/Servers/Kestrel/Core/src/Internal/Infrastructure/ThreadPoolAwaitable.cs index 69f3cb48d5..b0db58a240 100644 --- a/src/Servers/Kestrel/Core/src/Internal/Infrastructure/ThreadPoolAwaitable.cs +++ b/src/Servers/Kestrel/Core/src/Internal/Infrastructure/ThreadPoolAwaitable.cs @@ -9,7 +9,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http2 { internal class ThreadPoolAwaitable : ICriticalNotifyCompletion { - public static ThreadPoolAwaitable Instance = new ThreadPoolAwaitable(); + public static readonly ThreadPoolAwaitable Instance = new ThreadPoolAwaitable(); private ThreadPoolAwaitable() { diff --git a/src/Servers/Kestrel/Core/src/Internal/KestrelServerOptionsSetup.cs b/src/Servers/Kestrel/Core/src/Internal/KestrelServerOptionsSetup.cs index 0c7d0a375f..fd35a67b1d 100644 --- a/src/Servers/Kestrel/Core/src/Internal/KestrelServerOptionsSetup.cs +++ b/src/Servers/Kestrel/Core/src/Internal/KestrelServerOptionsSetup.cs @@ -8,7 +8,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal { internal class KestrelServerOptionsSetup : IConfigureOptions { - private IServiceProvider _services; + private readonly IServiceProvider _services; public KestrelServerOptionsSetup(IServiceProvider services) {