Fix disposal of faulted WCF client channels #322
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The disposal order in WcfClientActivator matters: WcfChannelHolder knows how to properly close/abort broken channels, while the WCF IDisposable implementation will throw an exception. Therefore, WcfChannelHolder.Dispose() needs to be called first, before the cleanup logic in AbstractComponentActivator invokes the WCF IDisposable implementation (via the DisposalConcern). The invocation order was originally correct, but it got inverted in 0c30043 "Improved concurrency during WCF channel failover". Restore the proper cleanup order, so that WCF channels are appropriately closed/aborted before being disposed. Fixes castleprojectGH-71 and castleprojectGH-104.
|
I'm guessing the AppVeyor build failure is not related to my changes: All tests passed when I invoked them locally (on .NET 4.6.2). |
|
Sorry for the delay, yes master is broken because of #321. The change looks good, I'll take another look after getting master sorted this weekend. If you get a chance to see this before I merge it could you update the changelog to include your fix. |
|
Merged, thanks. |
|
Thank you! Sorry, I've been out of town so I did not see your request for changelog update until now. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fix WCF client channel cleanup in WcfFacility, so that WCF channels are appropriately closed/aborted before being disposed. Otherwise, broken channels may cause exceptions to be thrown during container or scope disposal.
Fixes GH-71 and GH-104.