Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions src/NLog/Layouts/Typed/Layout.cs
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,6 @@ private sealed class LayoutGenericTypeValue : LayoutTypeValue, ILayoutTypeValue<
{
private readonly Layout<T> _ownerLayout;

public override Type InnerType => typeof(T);
public override IPropertyTypeConverter ValueTypeConverter => _ownerLayout.ValueTypeConverter;

public LayoutGenericTypeValue(Layout layout, string parseValueFormat, CultureInfo parseValueCulture, Layout<T> ownerLayout)
Expand Down Expand Up @@ -487,8 +486,8 @@ internal class LayoutTypeValue : ILayoutTypeValue
public bool ThreadAgnosticImmutable => _innerLayout.ThreadAgnosticImmutable;
public StackTraceUsage StackTraceUsage => _innerLayout.StackTraceUsage;
public virtual IPropertyTypeConverter ValueTypeConverter { get; }
public ILayoutTypeValue InnerLayout => this;
public virtual Type InnerType => null;
ILayoutTypeValue ILayoutTypeValue.InnerLayout => this;
Type ILayoutTypeValue.InnerType => _valueType;

public LayoutTypeValue(Layout layout, Type valueType, string parseValueFormat, CultureInfo parseValueCulture, IPropertyTypeConverter valueTypeConverter)
{
Expand Down Expand Up @@ -595,7 +594,7 @@ private string RenderStringValue(LogEventInfo logEvent, StringBuilder stringBuil
}
}

bool TryParseValueFromObject(object rawValue, string parseValueFormat, CultureInfo parseValueCulture, out object parsedValue)
private bool TryParseValueFromObject(object rawValue, string parseValueFormat, CultureInfo parseValueCulture, out object parsedValue)
{
try
{
Expand Down