- v11.0.3

eben-roux · eben-roux · commit 753a57f1d3c0 · 2019-06-27T20:04:23.000+02:00
diff --git a/Shuttle.Core.Data/DataRowMapper.cs b/Shuttle.Core.Data/DataRowMapper.cs
@@ -84,7 +84,16 @@ private PropertyInfo[] GetPropertyInfo<T>()
                         continue;
                     }
 
-                    pi.SetValue(result, value, null);
+                    if (value == DBNull.Value)
+                    {
+                        value = null;
+                    }
+
+                    if (value != null ||
+                        Nullable.GetUnderlyingType(pi.PropertyType) != null)
+                    {
+                        pi.SetValue(result, value, null);
+                    }
                 }
                 catch
                 {

Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,16 @@ private PropertyInfo[] GetPropertyInfo<T>()`
`84`	`84`	`continue;`
`85`	`85`	`}`
`86`	`86`
`87`		`- pi.SetValue(result, value, null);`
	`87`	`+ if (value == DBNull.Value)`
	`88`	`+ {`
	`89`	`+ value = null;`
	`90`	`+ }`
	`91`	`+`
	`92`	`+ if (value != null \|\|`
	`93`	`+ Nullable.GetUnderlyingType(pi.PropertyType) != null)`
	`94`	`+ {`
	`95`	`+ pi.SetValue(result, value, null);`
	`96`	`+ }`
`88`	`97`	`}`
`89`	`98`	`catch`
`90`	`99`	`{`