Merge pull request #117 from Azure/develop

Develop to master
Azure · Aug 29, 2018 · 270da80 · 270da80
2 parents 5af755a + 8629bbd
commit 270da80
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 4 deletions.
diff --git a/Microsoft.Azure.Amqp/Amqp/ReceivingAmqpLink.cs b/Microsoft.Azure.Amqp/Amqp/ReceivingAmqpLink.cs
@@ -741,7 +741,7 @@ static void OnTimer(object state)
             }
         }
 
-        sealed class DisposeAsyncResult : AsyncResult, IWork<DeliveryState>
+        sealed class DisposeAsyncResult : TimeoutAsyncResult<string>, IWork<DeliveryState>
         {
             readonly ReceivingAmqpLink link;
             readonly ArraySegment<byte> deliveryTag;
@@ -758,7 +758,7 @@ public DisposeAsyncResult(
                 TimeSpan timeout, 
                 AsyncCallback callback, 
                 object state)
-                : base(callback, state)
+                : base(timeout, callback, state)
             {
                 this.link = link;
                 this.deliveryTag = deliveryTag;
@@ -775,6 +775,7 @@ public static Outcome End(IAsyncResult result)
 
             public void Start()
             {
+                this.SetTimer();
                 DeliveryState deliveryState;
                 if (txnId.Array != null)
                 {
@@ -821,6 +822,18 @@ public void Cancel(bool completedSynchronously, Exception exception)
             {
                 this.Complete(completedSynchronously, exception);
             }
+
+            protected override string Target
+            {
+                get { return "dispose"; }
+            }
+
+            protected override void CompleteOnTimer()
+            {
+                // Timeout
+                this.link.pendingDispositions.CompleteWork(this.deliveryTag, true, AmqpConstants.RejectedOutcome);
+                base.CompleteOnTimer();
+            }
         }
 
         /// <summary>

diff --git a/Microsoft.Azure.Amqp/Amqp/Transport/TlsTransport.cs b/Microsoft.Azure.Amqp/Amqp/Transport/TlsTransport.cs
@@ -14,7 +14,7 @@ public class TlsTransport : TransportBase, IDisposable
         static readonly AsyncCallback onWriteComplete = OnWriteComplete;
         static readonly AsyncCallback onReadComplete = OnReadComplete;
         readonly TransportBase innerTransport;
-        readonly CustomSslStream sslStream;
+        protected readonly CustomSslStream sslStream;
         TlsTransportSettings tlsSettings;
         OperationState writeState;
         OperationState readState;

diff --git a/Microsoft.Azure.Amqp/Microsoft.Azure.Amqp.csproj b/Microsoft.Azure.Amqp/Microsoft.Azure.Amqp.csproj
@@ -22,6 +22,7 @@
     <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
     <GenerateAssemblyInformationalVersionAttribute>false</GenerateAssemblyInformationalVersionAttribute>
     <Configurations>Debug;Release;Signed</Configurations>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
   </PropertyGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">

diff --git a/Microsoft.Azure.Amqp/Properties/Version.cs b/Microsoft.Azure.Amqp/Properties/Version.cs
@@ -3,4 +3,4 @@
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyVersion("2.3.0.0")]
-[assembly: AssemblyInformationalVersion("2.3.2")]
+[assembly: AssemblyInformationalVersion("2.3.3")]