WebSocketTransport CloseInternal returning incorrect status.

Azure · Sep 10, 2021 · 3e3b7b1 · 3e3b7b1
1 parent 2787c19
commit 3e3b7b1
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 7 deletions.
diff --git a/Microsoft.Azure.Amqp/Amqp/Transport/WebSocketTransport.cs b/Microsoft.Azure.Amqp/Amqp/Transport/WebSocketTransport.cs
@@ -137,15 +137,16 @@ protected override bool CloseInternal()
             Task task = webSocket.CloseAsync(WebSocketCloseStatus.Empty, string.Empty, CancellationToken.None);
             if (task.IsCompleted)
             {
-                return false;
+                return true;
             }
 
             task.ContinueWith(t =>
             {
                 Exception exception = t.IsFaulted ? t.Exception.InnerException : (t.IsCanceled ? new OperationCanceledException() : null);
                 this.CompleteClose(false, exception);
             });
-            return true;
+
+            return false;
         }
 
         protected override void AbortInternal()

diff --git a/test/TestAmqpBroker/Properties/AssemblyInfo.cs b/test/TestAmqpBroker/Properties/AssemblyInfo.cs
@@ -0,0 +1,9 @@
+using System.Runtime.InteropServices;
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("BE4D50FC-A2FB-4CA3-9128-3B5E7AFAD30A")]
diff --git a/test/TestAmqpBroker/TestAmqpBroker.cs b/test/TestAmqpBroker/TestAmqpBroker.cs
@@ -98,7 +98,8 @@ public TestAmqpBroker(IList<string> endpoints, string userInfo, string sslValue,
                     listeners[i] = tcpSettings.CreateListener();
                 }
 #if !NETSTANDARD
-                else if (addressUri.Scheme.Equals("ws", StringComparison.OrdinalIgnoreCase))
+                else if (addressUri.Scheme.Equals("ws", StringComparison.OrdinalIgnoreCase) ||
+                    addressUri.Scheme.Equals("wss", StringComparison.OrdinalIgnoreCase))
                 {
                     WebSocketTransportSettings wsSettings = new WebSocketTransportSettings() { Uri = addressUri };
                     listeners[i] = wsSettings.CreateListener();

diff --git a/test/TestAmqpBroker/TestAmqpBroker.csproj b/test/TestAmqpBroker/TestAmqpBroker.csproj
@@ -12,9 +12,5 @@
   <ItemGroup>
     <ProjectReference Include="..\..\Microsoft.Azure.Amqp\Microsoft.Azure.Amqp.csproj" />
   </ItemGroup>
-
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
 
 </Project>