Merge pull request #90 from catcherwong/master

cnblogs-dudu · web-flow · commit 65321a4872a1 · 2018-12-30T10:05:01.000+08:00
Update Obsolete BsonReader and BsonWriter
diff --git a/Enyim.Caching/Memcached/Transcoders/DataContractTranscoder.cs b/Enyim.Caching/Memcached/Transcoders/DataContractTranscoder.cs
@@ -16,7 +16,7 @@ protected override object DeserializeObject(ArraySegment<byte> value)
         {
             using (var ms = new MemoryStream(value.Array, value.Offset, value.Count))
             {
-                using (BsonReader reader = new BsonReader(ms))
+                using (var reader = new BsonDataReader(ms))
                 {
                     JsonSerializer serializer = new JsonSerializer();
                     return serializer.Deserialize(reader);
@@ -28,7 +28,7 @@ protected override ArraySegment<byte> SerializeObject(object value)
         {
             using (var ms = new MemoryStream())
             {
-                using (BsonWriter writer = new BsonWriter(ms))
+                using (var writer = new BsonDataWriter(ms))
                 {
                     JsonSerializer serializer = new JsonSerializer();
                     serializer.Serialize(writer, value);
diff --git a/Enyim.Caching/Memcached/Transcoders/DefaultTranscoder.cs b/Enyim.Caching/Memcached/Transcoders/DefaultTranscoder.cs
@@ -356,7 +356,7 @@ protected virtual object DeserializeObject(ArraySegment<byte> value)
         {
             using (var ms = new MemoryStream(value.Array, value.Offset, value.Count))
             {
-                using (BsonReader reader = new BsonReader(ms))
+                using (var reader = new BsonDataReader(ms))
                 {
                     JsonSerializer serializer = new JsonSerializer();
                     return serializer.Deserialize(reader);

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ protected override object DeserializeObject(ArraySegment<byte> value)`
`16`	`16`	`{`
`17`	`17`	`using (var ms = new MemoryStream(value.Array, value.Offset, value.Count))`
`18`	`18`	`{`
`19`		`- using (BsonReader reader = new BsonReader(ms))`
	`19`	`+ using (var reader = new BsonDataReader(ms))`
`20`	`20`	`{`
`21`	`21`	`JsonSerializer serializer = new JsonSerializer();`
`22`	`22`	`return serializer.Deserialize(reader);`
`@@ -28,7 +28,7 @@ protected override ArraySegment<byte> SerializeObject(object value)`
`28`	`28`	`{`
`29`	`29`	`using (var ms = new MemoryStream())`
`30`	`30`	`{`
`31`		`- using (BsonWriter writer = new BsonWriter(ms))`
	`31`	`+ using (var writer = new BsonDataWriter(ms))`
`32`	`32`	`{`
`33`	`33`	`JsonSerializer serializer = new JsonSerializer();`
`34`	`34`	`serializer.Serialize(writer, value);`
Original file line number	Diff line number	Diff line change
`@@ -356,7 +356,7 @@ protected virtual object DeserializeObject(ArraySegment<byte> value)`
`356`	`356`	`{`
`357`	`357`	`using (var ms = new MemoryStream(value.Array, value.Offset, value.Count))`
`358`	`358`	`{`
`359`		`- using (BsonReader reader = new BsonReader(ms))`
	`359`	`+ using (var reader = new BsonDataReader(ms))`
`360`	`360`	`{`
`361`	`361`	`JsonSerializer serializer = new JsonSerializer();`
`362`	`362`	`return serializer.Deserialize(reader);`