Fix: nullref in websocket tokens endpoint

Piotrekol · Apr 2, 2021 · a0430ee · a0430ee
1 parent bf1c9e8
commit a0430ee
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/plugins/WebSocketDataSender/WebSocketKeyValueEndpoint.cs b/plugins/WebSocketDataSender/WebSocketKeyValueEndpoint.cs
@@ -77,9 +77,11 @@ public async Task SendLoop(IWebSocketContext context)
                                 continue;
                             var kvValue = GetValue(watchedKv.Key);
 
-                            var valueIsDifferent = (kvValue is double kvv)
-                                ? watchedKv.Value == null || Math.Abs(kvv - (double)watchedKv.Value) > double.Epsilon
-                                : !kvValue.Equals(watchedKv.Value);
+                            var valueIsDifferent = (kvValue == null || watchedKv.Value == null)
+                                ? kvValue != watchedKv.Value
+                                    : (kvValue is double kvv)
+                                        ? watchedKv.Value == null || Math.Abs(kvv - (double)watchedKv.Value) > double.Epsilon
+                                        : !kvValue.Equals(watchedKv.Value);
                             if (valueIsDifferent)
                             {
                                 watchedKeyValues[watchedKv.Key] = kvValue;