Add handlers to variable before using to avoid NullRefExceptions.

This commit is contained in:
Christian
2019-02-23 10:13:12 +01:00
parent ecc2cd5f0c
commit 09718a00e7
+12 -7
View File
@@ -100,12 +100,14 @@ namespace MQTTnet.Client
_logger.Info("Connected."); _logger.Info("Connected.");
Connected?.Invoke(this, new MqttClientConnectedEventArgs(authenticateResult)); var connectedHandler = ConnectedHandler;
if(ConnectedHandler != null) if (connectedHandler != null)
{ {
await ConnectedHandler.HandleConnectedAsync(new MqttClientConnectedEventArgs(authenticateResult)); await connectedHandler.HandleConnectedAsync(new MqttClientConnectedEventArgs(authenticateResult)).ConfigureAwait(false);
} }
// TODO: Remove!
Connected?.Invoke(this, new MqttClientConnectedEventArgs(authenticateResult));
return authenticateResult; return authenticateResult;
} }
@@ -268,11 +270,14 @@ namespace MQTTnet.Client
_cleanDisconnectInitiated = false; _cleanDisconnectInitiated = false;
_logger.Info("Disconnected."); _logger.Info("Disconnected.");
Disconnected?.Invoke(this, new MqttClientDisconnectedEventArgs(clientWasConnected, exception));
if(DisconnectedHandler != null) var disconnectedHandler = DisconnectedHandler;
if (disconnectedHandler != null)
{ {
await DisconnectedHandler.HandleDisconnectedAsync(new MqttClientDisconnectedEventArgs(clientWasConnected, exception)); await disconnectedHandler.HandleDisconnectedAsync(new MqttClientDisconnectedEventArgs(clientWasConnected, exception)).ConfigureAwait(false);
} }
Disconnected?.Invoke(this, new MqttClientDisconnectedEventArgs(clientWasConnected, exception));
} }
} }