Skip to content

Commit 32a7ed2

Browse files
authored
Merge pull request #70 from bcuff/so-fix
fix: stack overflow in Dispose method
2 parents 8913982 + 30b4e6a commit 32a7ed2

File tree

3 files changed

+47
-3
lines changed

3 files changed

+47
-3
lines changed
Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
using System;
2+
using System.Diagnostics;
3+
using System.Globalization;
4+
using System.Net.Http;
5+
using System.Text;
6+
using System.Threading;
7+
using System.Threading.Tasks;
8+
using Amazon.Runtime;
9+
using Elasticsearch.Net.Aws;
10+
using NUnit.Framework;
11+
using Elasticsearch.Net;
12+
using System.IO;
13+
using Amazon;
14+
#if NETFRAMEWORK
15+
using System.Net;
16+
#endif
17+
18+
namespace Tests
19+
{
20+
[TestFixture]
21+
public class SigningHttpMessageHandlerTests
22+
{
23+
private class TestHandler : HttpClientHandler
24+
{
25+
public bool Disposed;
26+
protected override void Dispose(bool disposing)
27+
{
28+
base.Dispose(disposing);
29+
Disposed = true;
30+
}
31+
}
32+
33+
#if NETCOREAPP
34+
[Test]
35+
public void TestDispose()
36+
{
37+
var inner = new TestHandler();
38+
var outer = new SigningHttpMessageHandler(new BasicAWSCredentials("foo", "bar"), RegionEndpoint.USEast1, inner);
39+
outer.Dispose();
40+
Assert.AreEqual(true, inner.Disposed);
41+
}
42+
#endif
43+
}
44+
}

src/Elasticsearch.Net.Aws/Elasticsearch.Net.Aws/Elasticsearch.Net.Aws.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
<TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
55
<AssemblyName>Elasticsearch.Net.Aws</AssemblyName>
66
<PackageId>Elasticsearch.Net.Aws</PackageId>
7-
<Version>7.2.0</Version>
7+
<Version>7.2.1</Version>
88
<Authors>Brandon Cuff</Authors>
99
<Description>Enables request signing necessary for using the AWS Elasticsearch service.</Description>
1010
<Copyright>Copyright 2015</Copyright>
1111
<PackageLicenseUrl>https://raw.githubusercontent.com/bcuff/elasticsearch-net-aws/master/LICENSE</PackageLicenseUrl>
1212
<PackageProjectUrl>https://github.com/bcuff/elasticsearch-net-aws</PackageProjectUrl>
13-
<PackageReleaseNotes>Fix to support HTTP compression.</PackageReleaseNotes>
13+
<PackageReleaseNotes>Fixed stack overflow in Dispose method.</PackageReleaseNotes>
1414
<PackageTags>elasticsearch elastic search aws amazon</PackageTags>
1515
<RepositoryUrl>https://github.com/bcuff/elasticsearch-net-aws</RepositoryUrl>
1616
</PropertyGroup>

src/Elasticsearch.Net.Aws/Elasticsearch.Net.Aws/SigningHttpMessageHandler.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ protected override void Dispose(bool disposing)
4141
}
4242
_innerHandlerDisposed = true;
4343
}
44-
base.Dispose();
44+
base.Dispose(disposing);
4545
}
4646
}
4747
}

0 commit comments

Comments
 (0)