Skip to content

Commit 0f01618

Browse files
eugbaranoveugbaranov
committed
Propagate ObjectDisposedException
1 parent b65821a commit 0f01618

File tree

10 files changed

+274
-0
lines changed

10 files changed

+274
-0
lines changed

‎src/Autofac/Autofac.csproj

+9
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,11 @@
7272
<AutoGen>True</AutoGen>
7373
<DependentUpon>DelegateActivatorResources.resx</DependentUpon>
7474
</Compile>
75+
<Compile Update="Core\Activators\InstanceActivatorResources.Designer.cs">
76+
<DesignTime>True</DesignTime>
77+
<AutoGen>True</AutoGen>
78+
<DependentUpon>InstanceActivatorResources.resx</DependentUpon>
79+
</Compile>
7580
<Compile Update="Core\Activators\ProvidedInstance\ProvidedInstanceActivatorResources.Designer.cs">
7681
<DesignTime>True</DesignTime>
7782
<AutoGen>True</AutoGen>
@@ -272,6 +277,10 @@
272277
<Generator>ResXFileCodeGenerator</Generator>
273278
<LastGenOutput>DelegateActivatorResources.Designer.cs</LastGenOutput>
274279
</EmbeddedResource>
280+
<EmbeddedResource Update="Core\Activators\InstanceActivatorResources.resx">
281+
<Generator>ResXFileCodeGenerator</Generator>
282+
<LastGenOutput>InstanceActivatorResources.Designer.cs</LastGenOutput>
283+
</EmbeddedResource>
275284
<EmbeddedResource Update="Core\Activators\ProvidedInstance\ProvidedInstanceActivatorResources.resx">
276285
<Generator>ResXFileCodeGenerator</Generator>
277286
<LastGenOutput>ProvidedInstanceActivatorResources.Designer.cs</LastGenOutput>

‎src/Autofac/Core/Activators/Delegate/DelegateActivator.cs

+2
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,8 @@ public object ActivateInstance(IComponentContext context, IEnumerable<Parameter>
6666
if (context == null) throw new ArgumentNullException(nameof(context));
6767
if (parameters == null) throw new ArgumentNullException(nameof(parameters));
6868

69+
CheckNotDisposed();
70+
6971
var result = _activationFunction(context, parameters);
7072
if (result == null)
7173
{

‎src/Autofac/Core/Activators/InstanceActivator.cs

+6
Original file line numberDiff line numberDiff line change
@@ -57,5 +57,11 @@ public override string ToString()
5757
{
5858
return LimitType.Name + " (" + GetType().Name + ")";
5959
}
60+
61+
protected void CheckNotDisposed()
62+
{
63+
if (IsDisposed)
64+
throw new ObjectDisposedException(InstanceActivatorResources.InstanceActivatorDisposed, innerException: null);
65+
}
6066
}
6167
}

‎src/Autofac/Core/Activators/InstanceActivatorResources.Designer.cs

+72
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/Autofac/Core/Activators/InstanceActivatorResources.resx

+123
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,123 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<root>
3+
<!--
4+
Microsoft ResX Schema
5+
6+
Version 2.0
7+
8+
The primary goals of this format is to allow a simple XML format
9+
that is mostly human readable. The generation and parsing of the
10+
various data types are done through the TypeConverter classes
11+
associated with the data types.
12+
13+
Example:
14+
15+
... ado.net/XML headers & schema ...
16+
<resheader name="resmimetype">text/microsoft-resx</resheader>
17+
<resheader name="version">2.0</resheader>
18+
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
19+
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
20+
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
21+
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
22+
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
23+
<value>[base64 mime encoded serialized .NET Framework object]</value>
24+
</data>
25+
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
26+
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
27+
<comment>This is a comment</comment>
28+
</data>
29+
30+
There are any number of "resheader" rows that contain simple
31+
name/value pairs.
32+
33+
Each data row contains a name, and value. The row also contains a
34+
type or mimetype. Type corresponds to a .NET class that support
35+
text/value conversion through the TypeConverter architecture.
36+
Classes that don't support this are serialized and stored with the
37+
mimetype set.
38+
39+
The mimetype is used for serialized objects, and tells the
40+
ResXResourceReader how to depersist the object. This is currently not
41+
extensible. For a given mimetype the value must be set accordingly:
42+
43+
Note - application/x-microsoft.net.object.binary.base64 is the format
44+
that the ResXResourceWriter will generate, however the reader can
45+
read any of the formats listed below.
46+
47+
mimetype: application/x-microsoft.net.object.binary.base64
48+
value : The object must be serialized with
49+
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
50+
: and then encoded with base64 encoding.
51+
52+
mimetype: application/x-microsoft.net.object.soap.base64
53+
value : The object must be serialized with
54+
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
55+
: and then encoded with base64 encoding.
56+
57+
mimetype: application/x-microsoft.net.object.bytearray.base64
58+
value : The object must be serialized into a byte array
59+
: using a System.ComponentModel.TypeConverter
60+
: and then encoded with base64 encoding.
61+
-->
62+
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
63+
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
64+
<xsd:element name="root" msdata:IsDataSet="true">
65+
<xsd:complexType>
66+
<xsd:choice maxOccurs="unbounded">
67+
<xsd:element name="metadata">
68+
<xsd:complexType>
69+
<xsd:sequence>
70+
<xsd:element name="value" type="xsd:string" minOccurs="0" />
71+
</xsd:sequence>
72+
<xsd:attribute name="name" use="required" type="xsd:string" />
73+
<xsd:attribute name="type" type="xsd:string" />
74+
<xsd:attribute name="mimetype" type="xsd:string" />
75+
<xsd:attribute ref="xml:space" />
76+
</xsd:complexType>
77+
</xsd:element>
78+
<xsd:element name="assembly">
79+
<xsd:complexType>
80+
<xsd:attribute name="alias" type="xsd:string" />
81+
<xsd:attribute name="name" type="xsd:string" />
82+
</xsd:complexType>
83+
</xsd:element>
84+
<xsd:element name="data">
85+
<xsd:complexType>
86+
<xsd:sequence>
87+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
88+
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
89+
</xsd:sequence>
90+
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
91+
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
92+
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
93+
<xsd:attribute ref="xml:space" />
94+
</xsd:complexType>
95+
</xsd:element>
96+
<xsd:element name="resheader">
97+
<xsd:complexType>
98+
<xsd:sequence>
99+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
100+
</xsd:sequence>
101+
<xsd:attribute name="name" type="xsd:string" use="required" />
102+
</xsd:complexType>
103+
</xsd:element>
104+
</xsd:choice>
105+
</xsd:complexType>
106+
</xsd:element>
107+
</xsd:schema>
108+
<resheader name="resmimetype">
109+
<value>text/microsoft-resx</value>
110+
</resheader>
111+
<resheader name="version">
112+
<value>2.0</value>
113+
</resheader>
114+
<resheader name="reader">
115+
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
116+
</resheader>
117+
<resheader name="writer">
118+
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119+
</resheader>
120+
<data name="InstanceActivatorDisposed" xml:space="preserve">
121+
<value>Instances cannot be created by this activator as it has already been disposed.</value>
122+
</data>
123+
</root>

‎src/Autofac/Core/Activators/ProvidedInstance/ProvidedInstanceActivator.cs

+2
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,8 @@ public object ActivateInstance(IComponentContext context, IEnumerable<Parameter>
6363
if (context == null) throw new ArgumentNullException(nameof(context));
6464
if (parameters == null) throw new ArgumentNullException(nameof(parameters));
6565

66+
CheckNotDisposed();
67+
6668
if (_activated)
6769
throw new InvalidOperationException(String.Format(CultureInfo.CurrentCulture, ProvidedInstanceActivatorResources.InstanceAlreadyActivated, this._instance.GetType()));
6870

‎src/Autofac/Core/Activators/Reflection/ReflectionActivator.cs

+2
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,8 @@ public object ActivateInstance(IComponentContext context, IEnumerable<Parameter>
9898
if (context == null) throw new ArgumentNullException(nameof(context));
9999
if (parameters == null) throw new ArgumentNullException(nameof(parameters));
100100

101+
CheckNotDisposed();
102+
101103
// Lazy instantiate available constructor list so the constructor
102104
// finder can be changed during AsSelf() registration. AsSelf() creates
103105
// a temporary activator just long enough to get the LimitType.

‎src/Autofac/Core/Resolving/InstanceLookup.cs

+4
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,10 @@ private object Activate(IEnumerable<Parameter> parameters, out object decoratorT
124124
_activationScope,
125125
resolveParameters);
126126
}
127+
catch (ObjectDisposedException)
128+
{
129+
throw;
130+
}
127131
catch (Exception ex)
128132
{
129133
throw new DependencyResolutionException(String.Format(CultureInfo.CurrentCulture, ComponentActivationResources.ErrorDuringActivation, this.ComponentRegistration), ex);

‎src/Autofac/Core/Resolving/ResolveOperation.cs

+4
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,10 @@ public object Execute(IComponentRegistration registration, IEnumerable<Parameter
8282
{
8383
result = ResolveComponent(registration, parameters);
8484
}
85+
catch (ObjectDisposedException)
86+
{
87+
throw;
88+
}
8589
catch (DependencyResolutionException dependencyResolutionException)
8690
{
8791
End(dependencyResolutionException);

‎test/Autofac.Test/Concurrency/ConcurrencyTests.cs

+50
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
using System;
2+
using System.Threading.Tasks;
3+
using Xunit;
4+
5+
namespace Autofac.Test.Concurrency
6+
{
7+
public sealed class ConcurrencyTests
8+
{
9+
private sealed class A
10+
{
11+
}
12+
13+
[Fact]
14+
public async Task RepeatedResolveWhileTheScopeIsDisposing_ObjectDisposedExceptionThrownOnly()
15+
{
16+
for (int i = 0; i < 100; i++)
17+
{
18+
await ResolveWhileTheScopeIsDisposing_ObjectDisposedExceptionThrownOnly();
19+
}
20+
}
21+
22+
private async Task ResolveWhileTheScopeIsDisposing_ObjectDisposedExceptionThrownOnly()
23+
{
24+
var cb = new ContainerBuilder();
25+
var container = cb.Build();
26+
27+
var scope = container.BeginLifetimeScope(builder => builder.RegisterType<A>());
28+
29+
var t = Task.Run(
30+
() =>
31+
{
32+
try
33+
{
34+
while (true)
35+
{
36+
scope.Resolve<A>();
37+
}
38+
}
39+
catch (ObjectDisposedException)
40+
{
41+
}
42+
});
43+
await Task.Delay(5);
44+
45+
scope.Dispose();
46+
47+
await t;
48+
}
49+
}
50+
}

0 commit comments

Comments
 (0)