Removed redundant || typeof(T) == typeof(string)

scottmcarthur · scottmcarthur · commit aace4fc11332 · 2014-06-19T13:49:00.000+01:00
diff --git a/src/ServiceStack.OrmLite/OrmLiteSPStatement.cs b/src/ServiceStack.OrmLite/OrmLiteSPStatement.cs
@@ -17,7 +17,7 @@ public OrmLiteSPStatement(IDbCommand cmd)
 
         public List<T> ConvertToList<T>()
         {
-            if ((typeof(T).IsPrimitive) || (typeof(T) == typeof(string)) || (typeof(T) == typeof(String)))
+            if (typeof(T).IsPrimitive || typeof(T) == typeof(string))
                 throw new Exception("Type " + typeof(T).Name + " is a primitive type. Use ConvertScalarToList function.");
 
             IDataReader reader = null;
@@ -55,7 +55,7 @@ public List<T> ConvertToScalarList<T>()
 
         public T ConvertTo<T>()
         {
-            if ((typeof(T).IsPrimitive) || (typeof(T) == typeof(string)) || (typeof(T) == typeof(String)))
+            if (typeof(T).IsPrimitive || typeof(T) == typeof(string))
                 throw new Exception("Type " + typeof(T).Name + " is a primitive type. Use ConvertScalarTo function.");
 
             IDataReader reader = null;

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ public OrmLiteSPStatement(IDbCommand cmd)`
`17`	`17`
`18`	`18`	`public List<T> ConvertToList<T>()`
`19`	`19`	`{`
`20`		`- if ((typeof(T).IsPrimitive) \|\| (typeof(T) == typeof(string)) \|\| (typeof(T) == typeof(String)))`
	`20`	`+ if (typeof(T).IsPrimitive \|\| typeof(T) == typeof(string))`
`21`	`21`	`throw new Exception("Type " + typeof(T).Name + " is a primitive type. Use ConvertScalarToList function.");`
`22`	`22`
`23`	`23`	`IDataReader reader = null;`
`@@ -55,7 +55,7 @@ public List<T> ConvertToScalarList<T>()`
`55`	`55`
`56`	`56`	`public T ConvertTo<T>()`
`57`	`57`	`{`
`58`		`- if ((typeof(T).IsPrimitive) \|\| (typeof(T) == typeof(string)) \|\| (typeof(T) == typeof(String)))`
	`58`	`+ if (typeof(T).IsPrimitive \|\| typeof(T) == typeof(string))`
`59`	`59`	`throw new Exception("Type " + typeof(T).Name + " is a primitive type. Use ConvertScalarTo function.");`
`60`	`60`
`61`	`61`	`IDataReader reader = null;`