#140 fixed NRE issue when ordering (#142)

Co-authored-by: Emrah Kondur <emrah.kondur@invicti.com>
ekondur · Aug 22, 2024 · b5e9c28 · b5e9c28
1 parent a4c6ef9
commit b5e9c28
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/DatatableJS.Net/Builders/OrderBuilder.cs b/DatatableJS.Net/Builders/OrderBuilder.cs
@@ -35,7 +35,7 @@ public OrderBuilder<T> Add<TProp>(Expression<Func<T, TProp>> property, OrderBy o
             var propertyName = ExpressionHelpers<T>.PropertyName(property);
 
             var column = _grid._columns
-                .Where(c => c.Data.Equals(propertyName))
+                .Where(c => c.Data != null && c.Data.Equals(propertyName))
                 .FirstOrDefault();
 
             if (column == null)

diff --git a/DatatableJS/Builders/OrderBuilder.cs b/DatatableJS/Builders/OrderBuilder.cs
@@ -35,7 +35,7 @@ public OrderBuilder<T> Add<TProp>(Expression<Func<T, TProp>> property, OrderBy o
             var propertyName = ExpressionHelpers<T>.PropertyName(property);
 
             var column = _grid._columns
-                .Where(c => c.Data.Equals(propertyName))
+                .Where(c => c.Data != null && c.Data.Equals(propertyName))
                 .FirstOrDefault();
 
             if (column == null)