Merge commit '36b2a5441105b27055592023270c250a1b57ee30' into uri

Author: rstam

Bson/Serialization/Serializers/NetPrimitiveSerializers.cs

@@ -1980,7 +1980,7 @@ public override object Deserialize(
                     bsonReader.ReadNull();
                     return null;
                 case BsonType.String:
-                    return new Uri(bsonReader.ReadString());
+                    return new Uri(bsonReader.ReadString(), UriKind.RelativeOrAbsolute);
                 default:
                     var message = string.Format("Cannot deserialize Uri from BsonType {0}.", bsonType);
                     throw new FileFormatException(message);
@@ -2006,7 +2006,7 @@ public override void Serialize(
             }
             else
             {
-                bsonWriter.WriteString(((Uri)value).AbsoluteUri);
+                bsonWriter.WriteString(((Uri)value).OriginalString);
             }
         }
     }

BsonUnitTests/DefaultSerializer/Serializers/NetPrimitiveSerializerTests.cs

@@ -1786,14 +1786,30 @@ public void TestHttp()
                 V = new Uri("http://www.cnn.com")
             };
             var json = obj.ToJson();
-            var expected = "{ 'V' : 'http://www.cnn.com/' }".Replace("'", "\"");
+            var expected = "{ 'V' : 'http://www.cnn.com' }".Replace("'", "\"");
             Assert.AreEqual(expected, json);
 
             var bson = obj.ToBson();
             var rehydrated = BsonSerializer.Deserialize<TestClass>(bson);
             Assert.IsTrue(bson.SequenceEqual(rehydrated.ToBson()));
         }
 
+		[Test]
+		public void TestRelative()
+		{
+			var obj = new TestClass
+			{
+				V = new Uri("/relative/page.html", UriKind.RelativeOrAbsolute)
+			};
+			var json = obj.ToJson();
+			var expected = "{ 'V' : '/relative/page.html' }".Replace("'", "\"");
+			Assert.AreEqual(expected, json);
+
+			var bson = obj.ToBson();
+			var rehydrated = BsonSerializer.Deserialize<TestClass>(bson);
+			Assert.IsTrue(bson.SequenceEqual(rehydrated.ToBson()));
+		}
+
         [Test]
         public void TestMongoDB()
         {