Merge pull request #2889 from youngbob/fix-media-range-null-case

Cast a null MediaRange reference to a null string
NancyFx · May 6, 2018 · 93c1594 · 93c1594
2 parents b7b20aa + 77caaf8
commit 93c1594
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/src/Nancy/Responses/Negotiation/MediaRange.cs b/src/Nancy/Responses/Negotiation/MediaRange.cs
@@ -122,6 +122,11 @@ public bool MatchesWithParameters(MediaRange other)
         /// </returns>
         public static implicit operator string(MediaRange mediaRange)
         {
+            if (null == mediaRange)
+            {
+                return null;
+            }
+
             if (mediaRange.Parameters.Any())
             {
                 return string.Concat(mediaRange.Type, "/", mediaRange.Subtype, ";", mediaRange.Parameters);

diff --git a/test/Nancy.Tests/Unit/Responses/Negotiation/MediaRangeFixture.cs b/test/Nancy.Tests/Unit/Responses/Negotiation/MediaRangeFixture.cs
@@ -83,5 +83,18 @@ public void Should_strip_whitespace_when_calling_tostring()
             // Then
             range.ToString().ShouldEqual("application/vnd.nancy;a=1;b=2");
         }
+
+        [Fact]
+        public void Should_cast_to_null_string()
+        {
+            // Given
+            MediaRange range = null;
+
+            // When
+            string cast = (string)range;
+
+            // Then
+            Assert.Null(cast);
+        }
     }
-}
+}