109: ExecuteReader returns a null reference instead of a data reader if the FieldCount is 0 in SqlAnywhere; added a null check for this

richardhopton · richardhopton · commit 37836042a8d0 · 2011-10-30T18:41:45.000Z
diff --git a/Simple.Data.Ado/ProcedureExecutor.cs b/Simple.Data.Ado/ProcedureExecutor.cs
@@ -74,7 +74,8 @@ public IEnumerable<ResultSet> ExecuteReader(IDbCommand command)
             command.Connection.Open();
             using (var reader = command.ExecuteReader())
             {
-                if (reader.FieldCount > 0)
+                // Reader isn't always returned - added check to stop NullReferenceException
+                if ((reader != null) && (reader.FieldCount > 0))
                 {
                     return reader.ToMultipleDictionaries();
                 }

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,8 @@ public IEnumerable<ResultSet> ExecuteReader(IDbCommand command)`
`74`	`74`	`command.Connection.Open();`
`75`	`75`	`using (var reader = command.ExecuteReader())`
`76`	`76`	`{`
`77`		`- if (reader.FieldCount > 0)`
	`77`	`+ // Reader isn't always returned - added check to stop NullReferenceException`
	`78`	`+ if ((reader != null) && (reader.FieldCount > 0))`
`78`	`79`	`{`
`79`	`80`	`return reader.ToMultipleDictionaries();`
`80`	`81`	`}`