cyberpresidentvanellope/tgstation-server
1
0
Fork 0
mirror of https://github.com/tgstation/tgstation-server.git synced 2026-08-26 22:48:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Do not null check collections when building subprojections as they should never be null

Browse Source
This commit is contained in:
Jordan Dominion
2025-08-17 20:13:18 -04:00
parent 84d4bddb68
commit 136f7a1572
1 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Tgstation.Server.Host/Models/TransformerBase{TInput,TOutput}.cs
+25 -10
View File
@@ -1,4 +1,5 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq.Expressions;
@@ -201,19 +202,33 @@ namespace Tgstation.Server.Host.Models
{
var subInputExpression = global::System.Linq.Expressions.Expression.Invoke(subInputSelectionExpressions[i], primaryInput);
var notNullExpression = global::System.Linq.Expressions.Expression.MakeBinary(
ExpressionType.NotEqual,
subInputExpression,
global::System.Linq.Expressions.Expression.Constant(null, subInputTypes[i]));
var subInputType = subInputTypes[i];
bool isCollection = false;
if (subInputType.IsGenericType)
{
var genericType = subInputType.GetGenericTypeDefinition();
if (typeof(IEnumerable<>).IsAssignableFrom(genericType))
{
isCollection = true;
}
}
var subOutputExpression = global::System.Linq.Expressions.Expression.Invoke(subInputTransformerExpressions[i], subInputExpression);
Expression subOutputExpression = global::System.Linq.Expressions.Expression.Invoke(subInputTransformerExpressions[i], subInputExpression);
var conditionalSubOutputExpression = global::System.Linq.Expressions.Expression.Condition(
notNullExpression,
subOutputExpression,
global::System.Linq.Expressions.Expression.Constant(null, subOutputTypes[i]));
if (!isCollection)
{
var notNullExpression = global::System.Linq.Expressions.Expression.MakeBinary(
ExpressionType.NotEqual,
subInputExpression,
global::System.Linq.Expressions.Expression.Constant(null, subInputType));
finalExpressionParameters[i + 1] = conditionalSubOutputExpression;
subOutputExpression = global::System.Linq.Expressions.Expression.Condition(
notNullExpression,
subOutputExpression,
global::System.Linq.Expressions.Expression.Constant(null, subOutputTypes[i]));
}
finalExpressionParameters[i + 1] = subOutputExpression;
}
var outputExpression = global::System.Linq.Expressions.Expression.Invoke(