Merge branch 'master' into es17.01

2017-03-03 18:53:33 +01:00
parent c7222d5fcc 7cde24a439
commit 4dcd2693e3
10 changed files with 29 additions and 25 deletions
--- a/modules/openid/persitence/cms_openid_storage_sql.e
+++ b/modules/openid/persitence/cms_openid_storage_sql.e
@@ -88,7 +88,7 @@ feature --Access: Consumers
 				from
 					sql_start
 				until
-					sql_after
+					sql_after or has_error
 				loop
 					if attached sql_read_string (1) as l_name then
 						Result.force (l_name)