@@ -334,6 +334,8 @@ public static T PopulateWithSqlReader<T>(this T objWithProperties,
334334 {
335335 values = PopulateValues ( reader , values , dialectProvider ) ;
336336
337+ var dbNullFilter = OrmLiteConfig . OnDbNullFilter ;
338+
337339 foreach ( var fieldCache in indexCache )
338340 {
339341 try
@@ -345,12 +347,9 @@ public static T PopulateWithSqlReader<T>(this T objWithProperties,
345347 if ( values != null && values [ index ] == DBNull . Value )
346348 {
347349 var value = fieldDef . IsNullable ? null : fieldDef . FieldTypeDefaultValue ;
348- if ( OrmLiteConfig . OnDbNullFilter != null )
349- {
350- var useValue = OrmLiteConfig . OnDbNullFilter ( fieldDef ) ;
351- if ( useValue != null )
352- value = useValue ;
353- }
350+ var useValue = dbNullFilter ? . Invoke ( fieldDef ) ;
351+ if ( useValue != null )
352+ value = useValue ;
354353
355354 fieldDef . SetValueFn ( objWithProperties , value ) ;
356355 }
@@ -361,12 +360,9 @@ public static T PopulateWithSqlReader<T>(this T objWithProperties,
361360 {
362361 if ( ! fieldDef . IsNullable )
363362 value = fieldDef . FieldTypeDefaultValue ;
364- if ( OrmLiteConfig . OnDbNullFilter != null )
365- {
366- var useValue = OrmLiteConfig . OnDbNullFilter ( fieldDef ) ;
367- if ( useValue != null )
368- value = useValue ;
369- }
363+ var useValue = dbNullFilter ? . Invoke ( fieldDef ) ;
364+ if ( useValue != null )
365+ value = useValue ;
370366 fieldDef . SetValueFn ( objWithProperties , value ) ;
371367 }
372368 else
@@ -381,6 +377,8 @@ public static T PopulateWithSqlReader<T>(this T objWithProperties,
381377 OrmLiteUtils . HandleException ( ex ) ;
382378 }
383379 }
380+
381+ OrmLiteConfig . PopulatedObjectFilter ? . Invoke ( objWithProperties ) ;
384382
385383 return objWithProperties ;
386384 }
0 commit comments