More defensive approach for DateTime convertion

kojoru · kojoru · commit e4ea45aa48cd · 2013-04-02T17:51:33.000+04:00
diff --git a/src/ServiceStack.OrmLite.SqlServer/SqlServerOrmLiteDialectProvider.cs b/src/ServiceStack.OrmLite.SqlServer/SqlServerOrmLiteDialectProvider.cs
@@ -101,8 +101,10 @@ public override object ConvertDbValue(object value, Type type)
 
                 if (_ensureUtc && type == typeof (DateTime))
                 {
-                    var result = (DateTime)base.ConvertDbValue(value, type);
-                    return DateTime.SpecifyKind(result, DateTimeKind.Utc);
+                    var result = base.ConvertDbValue(value, type);
+                    if(result is DateTime)
+                        return DateTime.SpecifyKind((DateTime)result, DateTimeKind.Utc);
+                    return result;
                 }
 
                 if (type == typeof(byte[]))

Original file line number	Diff line number	Diff line change
`@@ -101,8 +101,10 @@ public override object ConvertDbValue(object value, Type type)`
`101`	`101`
`102`	`102`	`if (_ensureUtc && type == typeof (DateTime))`
`103`	`103`	`{`
`104`		`- var result = (DateTime)base.ConvertDbValue(value, type);`
`105`		`- return DateTime.SpecifyKind(result, DateTimeKind.Utc);`
	`104`	`+ var result = base.ConvertDbValue(value, type);`
	`105`	`+ if(result is DateTime)`
	`106`	`+ return DateTime.SpecifyKind((DateTime)result, DateTimeKind.Utc);`
	`107`	`+ return result;`
`106`	`108`	`}`
`107`	`109`
`108`	`110`	`if (type == typeof(byte[]))`