Skip to content

DelegationRule.Dispose() unsets delegation property on the queue #28342

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
3 commits merged into from
Dec 11, 2020
Merged

DelegationRule.Dispose() unsets delegation property on the queue #28342

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
571f218
Add disposing pattern
shirhatti Dec 4, 2020
c9a362f
Stash (destination) urlgroup on a field
shirhatti Dec 10, 2020
5a6b76b
Make test explicit
shirhatti Dec 10, 2020
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
4 changes: 3 additions & 1 deletion src/Servers/HttpSys/src/DelegationRule.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ namespace Microsoft.AspNetCore.Server.HttpSys
public class DelegationRule : IDisposable
{
private readonly ILogger _logger;
private readonly UrlGroup _urlGroup;
private readonly UrlGroup _sourceQueueUrlGroup;
private bool _disposed;
/// <summary>
Expand All @@ -32,6 +33,7 @@ internal DelegationRule(UrlGroup sourceQueueUrlGroup, string queueName, string u
QueueName = queueName;
UrlPrefix = urlPrefix;
Queue = new RequestQueue(queueName, UrlPrefix, _logger, receiver: true);
_urlGroup = Queue.UrlGroup;
}

/// <inheritdoc />
Expand All @@ -49,7 +51,7 @@ public void Dispose()
_sourceQueueUrlGroup.UnSetDelegationProperty(Queue, throwOnError: false);
}
catch (ObjectDisposedException) { /* Server may have been shutdown */ }
Queue.UrlGroup.Dispose();
_urlGroup.Dispose();
Queue.Dispose();
}
}
Expand Down
4 changes: 3 additions & 1 deletion src/Servers/HttpSys/test/FunctionalTests/DelegateTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,9 +186,11 @@ public async Task UpdateDelegationRuleTest()

var delegationProperty = delegator.Features.Get<IServerDelegationFeature>();
destination = delegationProperty.CreateDelegationRule(queueName, receiverAddress);
// Send a request to ensure the rule is fully active
var responseString = await SendRequestAsync(delegatorAddress);
destination?.Dispose();
destination = delegationProperty.CreateDelegationRule(queueName, receiverAddress);
var responseString = await SendRequestAsync(delegatorAddress);
responseString = await SendRequestAsync(delegatorAddress);
Assert.Equal(_expectedResponseString, responseString);
destination?.Dispose();
}
Expand Down