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

fix 7.6-rc1 port

Browse Source
This commit is contained in:
Stephan
2017-05-22 17:22:10 +02:00
parent 9c58410d6c
commit 13ec3db2d3
70 changed files with 774 additions and 324 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/Umbraco.Core/Exceptions/LightInjectException.cs
View File

@@ -28,30 +28,44 @@ namespace Umbraco.Core.Exceptions
if (ex == null || ex.Message.StartsWith(LightInjectUnableToResolveType) == false)
return;
var messages = new List<string> { ex.Message };
var sb = new StringBuilder();
sb.AppendLine("Unresolved type: " + ex.Message.Substring(LightInjectUnableToResolveType.Length));
WriteDetails(ex, sb);
throw new LightInjectException(sb.ToString(), e);
}
public static void TryThrow(Exception e, Type implementingType)
{
var ex = e as InvalidOperationException;
if (ex == null || ex.Message.StartsWith(LightInjectUnableToResolveType) == false)
return;
var sb = new StringBuilder();
sb.AppendLine("Unresolved type: " + ex.Message.Substring(LightInjectUnableToResolveType.Length));
sb.AppendLine("Implementing type: " + implementingType);
WriteDetails(ex, sb);
throw new LightInjectException(sb.ToString(), e);
}
private static void WriteDetails(InvalidOperationException ex, StringBuilder sb)
{
ex = ex.InnerException as InvalidOperationException;
while (ex != null)
{
messages.Add(ex.Message);
var message = ex.Message;
if (message.StartsWith(LightInjectUnableToResolveType))
{
sb.AppendLine("-> Unresolved type: " + message.Substring(LightInjectUnableToResolveType.Length));
}
else if (message.StartsWith(LightInjectUnresolvedDependency))
{
var pos = message.InvariantIndexOf(LightInjectRequestedDependency);
sb.AppendLine("-> Unresolved dependency: " + message.Substring(pos + LightInjectRequestedDependency.Length + 1).TrimEnd(']'));
}
ex = ex.InnerException as InvalidOperationException;
}
var sb = new StringBuilder();
var last = messages.Last();
if (last.StartsWith(LightInjectUnableToResolveType))
{
sb.AppendLine("Unresolved type: " + last.Substring(LightInjectUnableToResolveType.Length));
}
else if (last.StartsWith(LightInjectUnresolvedDependency))
{
var pos = last.InvariantIndexOf(LightInjectRequestedDependency);
sb.AppendLine("Unresolved dependency: " + last.Substring(pos + LightInjectRequestedDependency.Length + 1).TrimEnd(']'));
sb.AppendLine(" (see inner exceptions for the entire dependencies chain).");
}
else return; // wtf?
throw new LightInjectException(sb.ToString(), e);
}
}
}