Skip to content
This repository has been archived by the owner on Jan 15, 2021. It is now read-only.

Null check in Views plugin #102

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
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
12 changes: 12 additions & 0 deletions source/Glimpse.MVC3/Plugin/Views.cs
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,18 @@ public object GetData(HttpContextBase context)
if (callMetadata.GlimpseView != null)
{
var viewContext = callMetadata.GlimpseView.ViewContext;

if (viewContext == null)
{
result.Add(new object[]
{
result.Count, callMetadata.ViewName, callMetadata.MasterName,
callMetadata.IsPartial.ToString(), null,
callMetadata.UseCache.ToString(), null, null, "no ViewContext"
});
continue;
}

object modelResult = null;
var vd = viewContext.ViewData.Flatten();
var td = viewContext.TempData.Flatten();
Expand Down
4 changes: 2 additions & 2 deletions source/Glimpse.MVC3/Plumbing/GlimpseView.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ namespace Glimpse.Mvc3.Plumbing
public class GlimpseView : IView
{
public IView View { get; set; }
internal ViewContext ViewContext { get; set; }
public ViewContext ViewContext { get; set; }

internal GlimpseView(IView view)
public GlimpseView(IView view)
{
View = view;
}
Expand Down
2 changes: 1 addition & 1 deletion source/Glimpse.MVC3/Plumbing/GlimpseViewEngine.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

namespace Glimpse.Mvc3.Plumbing
{
internal class GlimpseViewEngine : IViewEngine
public class GlimpseViewEngine : IViewEngine
{
public IViewEngine ViewEngine { get; set; }

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace Glimpse.Mvc3.Plumbing
{
internal class GlimpseViewEngineCallMetadata
public class GlimpseViewEngineCallMetadata
{
public ViewEngineResult ViewEngineResult { get; set; }
public bool IsPartial { get; set; }
Expand Down