Merge branch 'master' of https://github.com/hylasoft-usa/h-opc

hylasoft-usa · Aug 5, 2016 · 161157e · 161157e
2 parents a030a00 + ec97c7b
commit 161157e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/h-opc/Ua/UaClient.cs b/h-opc/Ua/UaClient.cs
@@ -106,8 +106,6 @@ private void SessionClosing(object sender, EventArgs e)
     /// </summary>
     public void ReConnect()
     {
-      if (Status != OpcStatus.Connected)
-        return;
       Status = OpcStatus.NotConnected;
       _session.Reconnect();
       Status = OpcStatus.Connected;
@@ -118,9 +116,6 @@ public void ReConnect()
     /// </summary>
     public void RecreateSession()
     {
-      if (Status != OpcStatus.Connected)
-        return;
-
       Status = OpcStatus.NotConnected;
       _session = Session.Recreate(_session);
       PostInitializeSession();
@@ -261,7 +256,7 @@ public Task WriteAsync<T>(string tag, T item)
       var nodesToWrite = BuildWriteValueCollection(tag, Attributes.Value, item);
 
       // Wrap the WriteAsync logic in a TaskCompletionSource, so we can use C# async/await syntax to call it:
-      var taskCompletionSource = new TaskCompletionSource<T>();
+      var taskCompletionSource = new TaskCompletionSource<StatusCode>();
       _session.BeginWrite(
           requestHeader: null,
           nodesToWrite: nodesToWrite,
@@ -277,6 +272,7 @@ public Task WriteAsync<T>(string tag, T item)
             {
               CheckReturnValue(response.ServiceResult);
               CheckReturnValue(results[0]);
+              taskCompletionSource.SetResult(response.ServiceResult);
             }
             catch (Exception ex)
             {

diff --git a/tests/UaTest.cs b/tests/UaTest.cs
@@ -212,6 +212,7 @@ public void UaTestSessionRecreate()
       Session oldSession = null;
       client.ServerConnectionLost += (object sender, EventArgs e) =>
       {
+        if (i > 0) return;
         i++;
         Assert.AreEqual(OpcStatus.NotConnected, client.Status);
         // store the session to make sure a new one is created