From 3bf9fa08e5e89bdc8427fe7a324018a17426f6ce Mon Sep 17 00:00:00 2001 From: John Colvin Date: Thu, 5 Sep 2019 17:32:19 -0500 Subject: [PATCH 1/2] SP-221 Deleting an alert with 'Not Between' causes the shell to crash --- src/client/spark/Predicates/IPredicate.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/client/spark/Predicates/IPredicate.cs b/src/client/spark/Predicates/IPredicate.cs index c5ae09899..9282ac2c5 100644 --- a/src/client/spark/Predicates/IPredicate.cs +++ b/src/client/spark/Predicates/IPredicate.cs @@ -215,7 +215,7 @@ namespace mbts { _second.Equals(other._second); public override bool Equals(object obj) => - Equals(obj is OrTrigger); + Equals(obj as OrTrigger); public override int GetHashCode() => EqualityComparer.aggregate_hash( From 043d8264423dba2eefb25154b87e1cc132626af9 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Thu, 5 Sep 2019 17:36:51 -0500 Subject: [PATCH 2/2] GreaterThanTrigger IEquatable impl --- src/client/spark/Predicates/IPredicate.cs | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/client/spark/Predicates/IPredicate.cs b/src/client/spark/Predicates/IPredicate.cs index 9282ac2c5..b1cdcbf94 100644 --- a/src/client/spark/Predicates/IPredicate.cs +++ b/src/client/spark/Predicates/IPredicate.cs @@ -256,7 +256,7 @@ namespace mbts { $"OrTrigger ({_first}, {_second})"; } - class GreaterThanTrigger : IPredicate { + class GreaterThanTrigger : IPredicate, IEquatable> { readonly T _value; readonly IComparer _comparer; @@ -268,6 +268,17 @@ namespace mbts { public bool trigger(T value) => _comparer.Compare(value, _value) > 0; + public bool Equals(GreaterThanTrigger other) => + other != null && + _comparer.Equals(other._comparer) && + _comparer.Compare(_value, other._value) == 0; + + public override bool Equals(object obj) => + Equals(obj as GreaterThanTrigger); + + public override int GetHashCode() => + _value.GetHashCode(); + public override string ToString() => $"GreaterThanTrigger ({_value})"; }