1 files changed, 19 insertions, 18 deletions
diff --git a/MediaBrowser.Common/Net/Handlers/BaseHandler.cs b/MediaBrowser.Common/Net/Handlers/BaseHandler.cs
index ecc58b316..1a014395a 100644
--- a/MediaBrowser.Common/Net/Handlers/BaseHandler.cs
+++ b/MediaBrowser.Common/Net/Handlers/BaseHandler.cs
@@ -25,18 +25,19 @@ namespace MediaBrowser.Common.Net.Handlers
             }
         }
 
-        private bool _TotalContentLengthDiscovered = false;
-        private long? _TotalContentLength = null;
+        private bool _totalContentLengthDiscovered;
+        private long? _totalContentLength;
         public long? TotalContentLength
         {
             get
             {
-                if (!_TotalContentLengthDiscovered)
+                if (!_totalContentLengthDiscovered)
                 {
-                    _TotalContentLength = GetTotalContentLength();
+                    _totalContentLength = GetTotalContentLength();
+                    _totalContentLengthDiscovered = true;
                 }
 
-                return _TotalContentLength;
+                return _totalContentLength;
             }
         }
 
@@ -64,14 +65,14 @@ namespace MediaBrowser.Common.Net.Handlers
             }
         }
 
-        protected List<KeyValuePair<long, long?>> _RequestedRanges = null;
+        private List<KeyValuePair<long, long?>> _requestedRanges;
         protected IEnumerable<KeyValuePair<long, long?>> RequestedRanges
         {
             get
             {
-                if (_RequestedRanges == null)
+                if (_requestedRanges == null)
                 {
-                    _RequestedRanges = new List<KeyValuePair<long, long?>>();
+                    _requestedRanges = new List<KeyValuePair<long, long?>>();
 
                     if (IsRangeRequest)
                     {
@@ -94,12 +95,12 @@ namespace MediaBrowser.Common.Net.Handlers
                                 end = long.Parse(vals[1]);
                             }
 
-                            _RequestedRanges.Add(new KeyValuePair<long, long?>(start, end));
+                            _requestedRanges.Add(new KeyValuePair<long, long?>(start, end));
                         }
                     }
                 }
 
-                return _RequestedRanges;
+                return _requestedRanges;
             }
         }
 
@@ -367,7 +368,7 @@ namespace MediaBrowser.Common.Net.Handlers
         {
             DateTime? value = null;
 
-            return Task.FromResult<DateTime?>(value);
+            return Task.FromResult(value);
         }
 
         private bool IsResponseValid
@@ -378,21 +379,21 @@ namespace MediaBrowser.Common.Net.Handlers
             }
         }
 
-        private Hashtable _FormValues = null;
+        private Hashtable _formValues;
 
         /// <summary>
         /// Gets a value from form POST data
         /// </summary>
         protected async Task<string> GetFormValue(string name)
         {
-            if (_FormValues == null)
+            if (_formValues == null)
             {
-                _FormValues = await GetFormValues(HttpListenerContext.Request).ConfigureAwait(false);
+                _formValues = await GetFormValues(HttpListenerContext.Request).ConfigureAwait(false);
             }
 
-            if (_FormValues.ContainsKey(name))
+            if (_formValues.ContainsKey(name))
             {
-                return _FormValues[name].ToString();
+                return _formValues[name].ToString();
             }
 
             return null;
@@ -403,7 +404,7 @@ namespace MediaBrowser.Common.Net.Handlers
         /// </summary>
         private async Task<Hashtable> GetFormValues(HttpListenerRequest request)
         {
-            Hashtable formVars = new Hashtable();
+            var formVars = new Hashtable();
 
             if (request.HasEntityBody)
             {
@@ -411,7 +412,7 @@ namespace MediaBrowser.Common.Net.Handlers
                 {
                     using (Stream requestBody = request.InputStream)
                     {
-                        using (StreamReader reader = new StreamReader(requestBody, request.ContentEncoding))
+                        using (var reader = new StreamReader(requestBody, request.ContentEncoding))
                         {
                             string s = await reader.ReadToEndAsync().ConfigureAwait(false);