Skip to content
This repository was archived by the owner on Dec 24, 2022. It is now read-only.

Commit 44f274b

Browse files
committed
Remove unnecessary CreateSetter(pi,fi)
1 parent 68fe112 commit 44f274b

File tree

5 files changed

+3
-30
lines changed

5 files changed

+3
-30
lines changed

build/copy-pcl.bat

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,4 @@ COPY ..\src\ServiceStack.Text\Pcl.* ..\..\ServiceStack\src\ServiceStack.Pcl.I
1717
COPY ..\src\ServiceStack.Text\Pcl.* ..\..\ServiceStack\src\ServiceStack.Pcl.Mac20\
1818
COPY ..\src\ServiceStack.Text\Pcl.* ..\..\ServiceStack\src\ServiceStack.Pcl.Net45\
1919
COPY ..\src\ServiceStack.Text\Pcl.* ..\..\ServiceStack\src\ServiceStack.Pcl.WinStore\
20-
COPY ..\src\ServiceStack.Text\Pcl.* ..\..\ServiceStack\src\ServiceStack.Pcl.WinStore81\
2120

src/ServiceStack.Text/Common/DeserializeType.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,9 @@ private static SetMemberDelegate GetSetPropertyMethod(TypeConfig typeConfig, Pro
350350
if (fieldInfo == null) return null;
351351
}
352352

353-
return PclExport.Instance.CreateSetter(propertyInfo, fieldInfo);
353+
return propertyInfo.CanWrite
354+
? PclExport.Instance.CreateSetter(propertyInfo)
355+
: PclExport.Instance.CreateSetter(fieldInfo);
354356
}
355357

356358
public static TypeAccessor Create(ITypeSerializer serializer, TypeConfig typeConfig, FieldInfo fieldInfo)

src/ServiceStack.Text/PclExport.Net40.cs

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -369,13 +369,6 @@ public override SetMemberDelegate<T> CreateSetter<T>(FieldInfo fieldInfo)
369369
: base.CreateSetter<T>(fieldInfo);
370370
}
371371

372-
public override SetMemberDelegate CreateSetter(PropertyInfo propertyInfo, FieldInfo fieldInfo)
373-
{
374-
return propertyInfo.CanWrite
375-
? CreateSetter(propertyInfo)
376-
: CreateSetter(fieldInfo);
377-
}
378-
379372
public override string ToXsdDateTimeString(DateTime dateTime)
380373
{
381374
#if !LITE

src/ServiceStack.Text/PclExport.NetStandard.cs

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -370,13 +370,6 @@ public override SetMemberDelegate<T> CreateSetter<T>(FieldInfo fieldInfo)
370370
: base.CreateSetter<T>(fieldInfo);
371371
}
372372

373-
public override SetMemberDelegate CreateSetter(PropertyInfo propertyInfo, FieldInfo fieldInfo)
374-
{
375-
return propertyInfo.CanWrite
376-
? CreateSetter(propertyInfo)
377-
: CreateSetter(fieldInfo);
378-
}
379-
380373
public override string ToXsdDateTimeString(DateTime dateTime)
381374
{
382375
return System.Xml.XmlConvert.ToString(dateTime.ToStableUniversalTime());

src/ServiceStack.Text/PclExport.cs

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -346,20 +346,6 @@ public virtual GetMemberDelegate<T> CreateGetter<T>(FieldInfo fieldInfo)
346346
return x => fieldInfo.GetValue(x);
347347
}
348348

349-
public virtual SetMemberDelegate CreateSetter(PropertyInfo propertyInfo, FieldInfo fieldInfo)
350-
{
351-
if (propertyInfo.CanWrite)
352-
{
353-
var setMethodInfo = propertyInfo.SetMethod();
354-
if (setMethodInfo.IsStatic)
355-
return (instance, value) => setMethodInfo.Invoke(null, new[] { value });
356-
357-
return (instance, value) => setMethodInfo.Invoke(instance, new[] { value });
358-
}
359-
if (fieldInfo == null) return null;
360-
return fieldInfo.SetValue;
361-
}
362-
363349
public virtual Type UseType(Type type)
364350
{
365351
return type;

0 commit comments

Comments
 (0)