Skip to content

Commit b9ab494

Browse files
Merge pull request #22 from SapientGuardian/remove_async_open
Remove async and add .wait() in Open() so exceptions can be caught
2 parents 59212ae + b308f76 commit b9ab494

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

Diff for: Source/MySql.Data/NativeDriver.cs

+6-6
Original file line numberDiff line numberDiff line change
@@ -192,16 +192,16 @@ public void Configure()
192192
stream.Encoding = Encoding;
193193
}
194194

195-
public async void Open()
195+
public void Open()
196196
{
197197
// connect to one of our specified hosts
198198
try
199199
{
200-
#if NETSTANDARD1_3
201-
baseStream = StreamCreator.GetStream(Settings).Result;
202-
#else
203-
baseStream = await StreamCreator.GetStream(Settings);
204-
#endif
200+
201+
var streamTask = StreamCreator.GetStream(Settings);
202+
streamTask.Wait();
203+
baseStream = streamTask.Result;
204+
205205
#if !CF && !RT && !NETSTANDARD1_3
206206
if (Settings.IncludeSecurityAsserts)
207207
MySqlSecurityPermission.CreatePermissionSet(false).Assert();

Diff for: Source/MySql.Data/project.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "6.9.810",
2+
"version": "6.9.811",
33
"description": "MySQL client library targeting netstandard 1.3",
44
"authors": [ "Oracle", "SapientGuardian", "ebyte23" ],
55
"buildOptions": {

0 commit comments

Comments
 (0)