yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core.Attempt - refactor and cleanup

Browse Source
This commit is contained in:
Stephan
2013-09-04 17:14:06 +02:00
parent 1ba8ad5fbb
commit 85ab96f71a
23 changed files with 284 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Umbraco.Core/Dynamics/DynamicInstanceHelper.cs
View File

@@ -82,7 +82,7 @@ namespace Umbraco.Core.Dynamics
null,
thisObject,
args);
return new Attempt<TryInvokeMemberResult>(true, new TryInvokeMemberResult(result, TryInvokeMemberSuccessReason.FoundProperty));
return Attempt.Succ(new TryInvokeMemberResult(result, TryInvokeMemberSuccessReason.FoundProperty));
}
catch (MissingMethodException)
{
@@ -97,7 +97,7 @@ namespace Umbraco.Core.Dynamics
null,
thisObject,
args);
return new Attempt<TryInvokeMemberResult>(true, new TryInvokeMemberResult(result, TryInvokeMemberSuccessReason.FoundMethod));
return Attempt.Succ(new TryInvokeMemberResult(result, TryInvokeMemberSuccessReason.FoundMethod));
}
catch (MissingMethodException)
{
@@ -106,13 +106,13 @@ namespace Umbraco.Core.Dynamics
try
{
result = FindAndExecuteExtensionMethod(thisObject, args, binder.Name, findExtensionMethodsOnTypes);
return new Attempt<TryInvokeMemberResult>(true, new TryInvokeMemberResult(result, TryInvokeMemberSuccessReason.FoundExtensionMethod));
return Attempt.Succ(new TryInvokeMemberResult(result, TryInvokeMemberSuccessReason.FoundExtensionMethod));
}
catch (TargetInvocationException ext)
{
//don't log here, we return this exception because the caller may need to do something specific when
//this exception occurs.
return new Attempt<TryInvokeMemberResult>(ext);
return Attempt<TryInvokeMemberResult>.Fail(ext);
}
catch (Exception ex)
{
@@ -124,16 +124,16 @@ namespace Umbraco.Core.Dynamics
sb.Append(t + ",");
}
LogHelper.Error<DynamicInstanceHelper>(sb.ToString(), ex);
return new Attempt<TryInvokeMemberResult>(ex);
return Attempt<TryInvokeMemberResult>.Fail(ex);
}
}
return Attempt<TryInvokeMemberResult>.False;
return Attempt<TryInvokeMemberResult>.Fail();
}
}
catch (Exception ex)
{
LogHelper.Error<DynamicInstanceHelper>("An unhandled exception occurred in method TryInvokeMember", ex);
return new Attempt<TryInvokeMemberResult>(ex);
return Attempt<TryInvokeMemberResult>.Fail(ex);
}
}