@@ -107,6 +107,11 @@ public class Connection : IConnection
107
107
private Timer _heartbeatReadTimer ;
108
108
private AutoResetEvent m_heartbeatRead = new AutoResetEvent ( false ) ;
109
109
110
+ private readonly object _heartBeatReadLock = new object ( ) ;
111
+ private readonly object _heartBeatWriteLock = new object ( ) ;
112
+ private bool m_hasDisposedHeartBeatReadTimer ;
113
+ private bool m_hasDisposedHeartBeatWriteTimer ;
114
+
110
115
#if CORECLR
111
116
private static string version = typeof ( Connection ) . GetTypeInfo ( ) . Assembly
112
117
. GetCustomAttribute < AssemblyInformationalVersionAttribute > ( )
@@ -1012,8 +1017,8 @@ public void MaybeStartHeartbeatTimers()
1012
1017
{
1013
1018
if ( Heartbeat != 0 )
1014
1019
{
1015
- IsDisposedHeartBeatReadTimer = false ;
1016
- IsDisposedHeartBeatWriteTimer = false ;
1020
+ m_hasDisposedHeartBeatReadTimer = false ;
1021
+ m_hasDisposedHeartBeatWriteTimer = false ;
1017
1022
#if NETFX_CORE
1018
1023
_heartbeatWriteTimer = new Timer ( HeartbeatWriteTimerCallback ) ;
1019
1024
_heartbeatReadTimer = new Timer ( HeartbeatReadTimerCallback ) ;
@@ -1042,16 +1047,11 @@ public void StartMainLoop(bool useBackgroundThread)
1042
1047
#endif
1043
1048
}
1044
1049
1045
- private readonly object heartBeatReadLock = new object ( ) ;
1046
- private readonly object heartBeatWriteLock = new object ( ) ;
1047
- public bool IsDisposedHeartBeatReadTimer { get ; set ; }
1048
- public bool IsDisposedHeartBeatWriteTimer { get ; set ; }
1049
-
1050
1050
public void HeartbeatReadTimerCallback ( object state )
1051
1051
{
1052
- lock ( heartBeatReadLock )
1052
+ lock ( _heartBeatReadLock )
1053
1053
{
1054
- if ( IsDisposedHeartBeatReadTimer )
1054
+ if ( m_hasDisposedHeartBeatReadTimer )
1055
1055
{
1056
1056
return ;
1057
1057
}
@@ -1110,9 +1110,9 @@ public void HeartbeatReadTimerCallback(object state)
1110
1110
1111
1111
public void HeartbeatWriteTimerCallback ( object state )
1112
1112
{
1113
- lock ( heartBeatWriteLock )
1113
+ lock ( _heartBeatWriteLock )
1114
1114
{
1115
- if ( IsDisposedHeartBeatWriteTimer )
1115
+ if ( m_hasDisposedHeartBeatWriteTimer )
1116
1116
{
1117
1117
return ;
1118
1118
}
@@ -1152,16 +1152,16 @@ public void HeartbeatWriteTimerCallback(object state)
1152
1152
1153
1153
protected void MaybeStopHeartbeatTimers ( )
1154
1154
{
1155
- lock ( heartBeatReadLock )
1155
+ lock ( _heartBeatReadLock )
1156
1156
{
1157
1157
MaybeDisposeTimer ( ref _heartbeatReadTimer ) ;
1158
- IsDisposedHeartBeatReadTimer = true ;
1158
+ m_hasDisposedHeartBeatReadTimer = true ;
1159
1159
}
1160
1160
1161
- lock ( heartBeatWriteLock )
1161
+ lock ( _heartBeatWriteLock )
1162
1162
{
1163
1163
MaybeDisposeTimer ( ref _heartbeatWriteTimer ) ;
1164
- IsDisposedHeartBeatWriteTimer = true ;
1164
+ m_hasDisposedHeartBeatWriteTimer = true ;
1165
1165
}
1166
1166
}
1167
1167
0 commit comments