Skip to content

Commit 7f2064c

Browse files
fixed boolean or converter so that it handles boolean values, as well as corrected the default value for IsValue
1 parent 732751d commit 7f2064c

File tree

2 files changed

+5
-13
lines changed

2 files changed

+5
-13
lines changed

src/Protocol/Models/BooleanOr.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public BooleanOr(bool value)
1515
_bool = value;
1616
}
1717

18-
public bool IsValue => this._value != null;
18+
public bool IsValue => this._value != default;
1919
public T Value
2020
{
2121
get { return this._value; }

src/Protocol/Serialization/Converters/BooleanOrConverter.cs

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,23 +23,15 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
2323

2424
private static void WriteJsonGeneric<T>(JsonWriter writer, BooleanOr<T> value, JsonSerializer serializer)
2525
{
26-
if (value.IsValue)
26+
if (value.IsBool)
2727
{
28-
if (typeof(T).IsValueType)
29-
{
30-
new JValue(value.Value).WriteTo(writer);
31-
}
32-
else
33-
{
34-
serializer.Serialize(writer, value.Value);
35-
}
36-
28+
new JValue(value.Bool).WriteTo(writer);
3729
return;
3830
}
3931

40-
if (value.IsBool)
32+
if (value.IsValue)
4133
{
42-
new JValue(value.Bool).WriteTo(writer);
34+
serializer.Serialize(writer, value.Value);
4335
return;
4436
}
4537

0 commit comments

Comments
 (0)