From b308f7655c957a170894bddfd2563a6b21d94e1d Mon Sep 17 00:00:00 2001 From: Noah Potash Date: Sat, 2 Jul 2016 11:31:35 -0400 Subject: [PATCH] Removed async and added .wait() in Open() so exceptions can be caught --- Source/MySql.Data/NativeDriver.cs | 12 ++++++------ Source/MySql.Data/project.json | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Source/MySql.Data/NativeDriver.cs b/Source/MySql.Data/NativeDriver.cs index abad7c6d9..1d60ef81d 100644 --- a/Source/MySql.Data/NativeDriver.cs +++ b/Source/MySql.Data/NativeDriver.cs @@ -192,16 +192,16 @@ public void Configure() stream.Encoding = Encoding; } - public async void Open() + public void Open() { // connect to one of our specified hosts try { -#if NETSTANDARD1_3 - baseStream = StreamCreator.GetStream(Settings).Result; -#else - baseStream = await StreamCreator.GetStream(Settings); -#endif + + var streamTask = StreamCreator.GetStream(Settings); + streamTask.Wait(); + baseStream = streamTask.Result; + #if !CF && !RT && !NETSTANDARD1_3 if (Settings.IncludeSecurityAsserts) MySqlSecurityPermission.CreatePermissionSet(false).Assert(); diff --git a/Source/MySql.Data/project.json b/Source/MySql.Data/project.json index e3e54198a..f3570fe99 100644 --- a/Source/MySql.Data/project.json +++ b/Source/MySql.Data/project.json @@ -1,5 +1,5 @@ { - "version": "6.9.810", + "version": "6.9.811", "description": "MySQL client library targeting netstandard 1.3", "authors": [ "Oracle", "SapientGuardian", "ebyte23" ], "buildOptions": {