@@ -3,7 +3,7 @@ namespace Nancy
3
3
using System ;
4
4
using System . IO ;
5
5
using System . Runtime . Serialization ;
6
- using System . Runtime . Serialization . Formatters . Binary ;
6
+ using Nancy . Json ;
7
7
8
8
public class DefaultObjectSerializer : IObjectSerializer
9
9
{
@@ -16,14 +16,14 @@ public string Serialize(object sourceObject)
16
16
{
17
17
if ( sourceObject == null )
18
18
{
19
- return String . Empty ;
19
+ return string . Empty ;
20
20
}
21
21
22
- var formatter = new BinaryFormatter ( ) ;
23
-
24
22
using ( var outputStream = new MemoryStream ( ) )
23
+ using ( var writer = new StreamWriter ( outputStream ) )
25
24
{
26
- formatter . Serialize ( outputStream , sourceObject ) ;
25
+ var jsonSerializer = new JsonSerializer ( new JavaScriptSerializer ( ) ) ;
26
+ jsonSerializer . Serialize ( sourceObject , writer ) ;
27
27
28
28
var outputBytes = outputStream . GetBuffer ( ) ;
29
29
@@ -47,11 +47,11 @@ public object Deserialize(string sourceString)
47
47
{
48
48
var inputBytes = Convert . FromBase64String ( sourceString ) ;
49
49
50
- var formatter = new BinaryFormatter ( ) ;
51
-
52
50
using ( var inputStream = new MemoryStream ( inputBytes , false ) )
51
+ using ( var streamreader = new StreamReader ( inputStream ) )
53
52
{
54
- return formatter . Deserialize ( inputStream ) ;
53
+ var deserialzier = new JsonDeserializer ( new JavaScriptSerializer ( ) ) ;
54
+ return deserialzier . Deserialize ( streamreader ) ;
55
55
}
56
56
}
57
57
catch ( FormatException )
@@ -62,10 +62,10 @@ public object Deserialize(string sourceString)
62
62
{
63
63
return null ;
64
64
}
65
- catch ( IOException )
66
- {
67
- return null ;
68
- }
65
+ catch ( IOException )
66
+ {
67
+ return null ;
68
+ }
69
69
}
70
70
}
71
71
}
0 commit comments