pepperdash/Essentials
1
0
Fork 0
mirror of https://github.com/PepperDash/Essentials.git synced 2026-04-13 20:47:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix: check for nulls in SwitchingDevice property

Browse source
This commit is contained in:
Andrew Welker 2024-10-18 11:09:15 -05:00
parent f04f70495f
commit 631dd2b00d
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/PepperDash.Essentials.Core/Routing/RouteSwitchDescriptor.cs
View file

@ -5,7 +5,7 @@
/// </summary> /// </summary>
public class RouteSwitchDescriptor public class RouteSwitchDescriptor
{ {
public IRoutingInputs SwitchingDevice { get { return InputPort.ParentDevice; } } public IRoutingInputs SwitchingDevice { get { return InputPort?.ParentDevice; } }
public RoutingOutputPort OutputPort { get; set; } public RoutingOutputPort OutputPort { get; set; }
public RoutingInputPort InputPort { get; set; } public RoutingInputPort InputPort { get; set; }
@ -23,9 +23,9 @@
public override string ToString() public override string ToString()
{ {
if (SwitchingDevice is IRouting) if (SwitchingDevice is IRouting)
return $"{SwitchingDevice?.Key} switches output {OutputPort?.Key} to input {InputPort?.Key}"; return $"{(SwitchingDevice != null ? SwitchingDevice.Key : "No Device")} switches output {(OutputPort != null ? OutputPort.Key : "No output port")} to input {(InputPort != null ? InputPort.Key : "No input port")}";
else else
return $"{SwitchingDevice?.Key} switches to input {InputPort?.Key}"; return $"{(SwitchingDevice != null ? SwitchingDevice.Key : "No Device")} switches to input {(InputPort != null ? InputPort.Key : "No input port")}";
} }
} }

2
src/PepperDash.Essentials.Core/Routing/RoutingFeedbackManager.cs
View file

@ -217,7 +217,7 @@ namespace PepperDash.Essentials.Core.Routing
var currentRoute = midpoint.CurrentRoutes.FirstOrDefault(route => { var currentRoute = midpoint.CurrentRoutes.FirstOrDefault(route => {
Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose, "Checking {route} against {tieLine}", this, route, tieLine); Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose, "Checking {route} against {tieLine}", this, route, tieLine);
return route.OutputPort?.Key == tieLine.SourcePort.Key && route.OutputPort?.ParentDevice.Key == tieLine.SourcePort.ParentDevice.Key; return route.OutputPort != null && route.InputPort != null && route.OutputPort?.Key == tieLine.SourcePort.Key && route.OutputPort?.ParentDevice.Key == tieLine.SourcePort.ParentDevice.Key;
}); });
if (currentRoute == null) if (currentRoute == null)