Skip to content

Commit 6039823

Browse files
committed
Removed unneeded methods from AccessOptimizer and corrected serialization for isBytecodeProviderImpl field
1 parent edf7265 commit 6039823

File tree

3 files changed

+6
-14
lines changed

3 files changed

+6
-14
lines changed

src/NHibernate/Bytecode/Lightweight/AccessOptimizer.cs

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -62,32 +62,22 @@ public void SetPropertyValues(object target, object[] values)
6262

6363
public void SetPropertyValue(object target, int i, object value)
6464
{
65-
SetPropertyValue(target, value, _setters[i]);
65+
_setters[i](target, value);
6666
}
6767

6868
public object GetPropertyValue(object target, int i)
6969
{
70-
return GetPropertyValue(target, _getters[i]);
70+
return _getters[i](target);
7171
}
7272

7373
internal void SetSpecializedPropertyValue(object target, object value)
7474
{
75-
SetPropertyValue(target, value, _specializedSetter);
75+
_specializedSetter(target, value);
7676
}
7777

7878
internal object GetSpecializedPropertyValue(object target)
7979
{
80-
return GetPropertyValue(target, _specializedGetter);
81-
}
82-
83-
private static object GetPropertyValue(object target, GetPropertyValueInvoker getter)
84-
{
85-
return getter(target);
86-
}
87-
88-
private static void SetPropertyValue(object target, object value, SetPropertyValueInvoker setter)
89-
{
90-
setter(target, value);
80+
return _specializedGetter(target);
9181
}
9282
}
9383
}

src/NHibernate/Tuple/Component/PocoComponentTuplizer.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ public class PocoComponentTuplizer : AbstractComponentTuplizer
1919
private readonly IGetter parentGetter;
2020
[NonSerialized]
2121
private IReflectionOptimizer optimizer;
22+
[NonSerialized]
2223
private bool isBytecodeProviderImpl; // 6.0 TODO: remove
2324

2425

src/NHibernate/Tuple/Entity/PocoEntityTuplizer.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ public class PocoEntityTuplizer : AbstractEntityTuplizer
3030
[NonSerialized]
3131
private IReflectionOptimizer optimizer;
3232
private readonly IProxyValidator proxyValidator;
33+
[NonSerialized]
3334
private bool isBytecodeProviderImpl; // 6.0 TODO: remove
3435

3536
[OnDeserialized]

0 commit comments

Comments
 (0)