From 88cd886a5ba9f2c19bd537eb6c264d06a3ba4eb0 Mon Sep 17 00:00:00 2001
From: dougbu <dougbu@microsoft.com>
Date: Thu, 26 Jun 2014 14:22:07 -0700
Subject: [PATCH] Ensure `TemplateInfo.FormattedModelValue` & `HtmlFieldPrefix`
 are not `null` - Fixes #705

---
 src/Microsoft.AspNet.Mvc.Core/TemplateInfo.cs | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/Microsoft.AspNet.Mvc.Core/TemplateInfo.cs b/src/Microsoft.AspNet.Mvc.Core/TemplateInfo.cs
index 1fb063ef81..842fb1f078 100644
--- a/src/Microsoft.AspNet.Mvc.Core/TemplateInfo.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/TemplateInfo.cs
@@ -9,13 +9,16 @@ namespace Microsoft.AspNet.Mvc
 {
     public class TemplateInfo
     {
+        private string _htmlFieldPrefix;
+        private object _formattedModelValue;
+
         // Keep a collection of visited objects to prevent infinite recursion.
         private HashSet<object> _visitedObjects;
 
         public TemplateInfo()
         {
-            FormattedModelValue = string.Empty;
-            HtmlFieldPrefix = string.Empty;
+            _htmlFieldPrefix = string.Empty;
+            _formattedModelValue = string.Empty;
             _visitedObjects = new HashSet<object>();
         }
 
@@ -26,9 +29,17 @@ namespace Microsoft.AspNet.Mvc
             _visitedObjects = new HashSet<object>(original._visitedObjects);
         }
 
-        public object FormattedModelValue { get; set; }
+        public object FormattedModelValue
+        {
+            get { return _formattedModelValue; }
+            set { _formattedModelValue = value ?? string.Empty; }
+        }
 
-        public string HtmlFieldPrefix { get; set; }
+        public string HtmlFieldPrefix
+        {
+            get { return _htmlFieldPrefix; }
+            set { _htmlFieldPrefix = value ?? string.Empty; }
+        }
 
         public int TemplateDepth
         {