Skip to content

Remove async and add .wait() in Open() so exceptions can be caught #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 2, 2016
Merged

Remove async and add .wait() in Open() so exceptions can be caught #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions Source/MySql.Data/NativeDriver.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion Source/MySql.Data/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down