Skip to content

Commit cb8503b

Browse files
committed
Optimize columnInfoRef checking
1 parent 126b691 commit cb8503b

2 files changed

Lines changed: 5 additions & 2 deletions

File tree

Orm/Xtensive.Orm/Orm/Model/ColumnInfoRef.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ namespace Xtensive.Orm.Model
4040
/// </summary>
4141
public CultureInfo CultureInfo { get; }
4242

43+
public bool HasValue => TypeName != null;
44+
4345
/// <summary>
4446
/// Resolves this instance to <see cref="ColumnInfo"/> object within specified <paramref name="model"/>.
4547
/// </summary>

Orm/Xtensive.Orm/Orm/Rse/Providers/Compilable/OrderProviderBase.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,9 @@ protected override void Initialize()
6767
for (int i = 0; i < Order.Count; i++) {
6868
var orderItem = Order[i];
6969
var column = Header.Columns[orderItem.Key];
70-
var culture = column is MappedColumn mappedColumn && mappedColumn.ColumnInfoRef != default
71-
? mappedColumn.ColumnInfoRef.CultureInfo
70+
var columnInfoRef = (column as MappedColumn)?.ColumnInfoRef;
71+
var culture = columnInfoRef?.HasValue == true
72+
? columnInfoRef.Value.CultureInfo
7273
: CultureInfo.InvariantCulture;
7374
comparisonRules[i] = new ComparisonRule(orderItem.Value, culture);
7475
}

0 commit comments

Comments
 (0)