You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by pu...@apache.org on 2012/04/28 02:26:43 UTC
[4/13] wp7 commit: CB-596
CB-596
Project: http://git-wip-us.apache.org/repos/asf/incubator-cordova-wp7/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cordova-wp7/commit/3fd94350
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-wp7/tree/3fd94350
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-wp7/diff/3fd94350
Branch: refs/heads/master
Commit: 3fd94350483c7a54f143d4c25f0ec675bc23bb99
Parents: c341247
Author: Jesse MacFadyen <pu...@gmail.com>
Authored: Fri Apr 27 15:14:48 2012 -0700
Committer: Jesse MacFadyen <pu...@gmail.com>
Committed: Fri Apr 27 15:14:48 2012 -0700
----------------------------------------------------------------------
framework/Cordova/Commands/FileTransfer.cs | 2 ++
framework/Cordova/JSON/JsonHelper.cs | 17 ++++++++++++++---
2 files changed, 16 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cordova-wp7/blob/3fd94350/framework/Cordova/Commands/FileTransfer.cs
----------------------------------------------------------------------
diff --git a/framework/Cordova/Commands/FileTransfer.cs b/framework/Cordova/Commands/FileTransfer.cs
index 05a1fff..dbea98b 100644
--- a/framework/Cordova/Commands/FileTransfer.cs
+++ b/framework/Cordova/Commands/FileTransfer.cs
@@ -215,6 +215,8 @@ namespace WP7CordovaClassLib.Cordova.Commands
/// <param name="options">Upload options</param>
public void upload(string options)
{
+ options = options.Replace("{}", "null");
+
try
{
try
http://git-wip-us.apache.org/repos/asf/incubator-cordova-wp7/blob/3fd94350/framework/Cordova/JSON/JsonHelper.cs
----------------------------------------------------------------------
diff --git a/framework/Cordova/JSON/JsonHelper.cs b/framework/Cordova/JSON/JsonHelper.cs
index 325a20d..0eff386 100644
--- a/framework/Cordova/JSON/JsonHelper.cs
+++ b/framework/Cordova/JSON/JsonHelper.cs
@@ -26,6 +26,7 @@ using System.Runtime.Serialization.Json;
using System.IO;
using System.Collections.Generic;
using System.Text;
+using System.Diagnostics;
namespace WP7CordovaClassLib.Cordova.JSON
{
@@ -75,12 +76,22 @@ namespace WP7CordovaClassLib.Cordova.JSON
public static T Deserialize<T>(string json)
{
DataContractJsonSerializer deserializer = new DataContractJsonSerializer(typeof(T));
-
- using (MemoryStream mem = new MemoryStream(Encoding.UTF8.GetBytes(json)))
+ object result = null;
+ try
+ {
+ using (MemoryStream mem = new MemoryStream(Encoding.UTF8.GetBytes(json)))
+ {
+ result = deserializer.ReadObject(mem);
+ }
+ }
+ catch (Exception ex)
{
- return (T)deserializer.ReadObject(mem);
+ Debug.WriteLine(ex.Message);
+ Debug.WriteLine("Failed to deserialize " + typeof(T) + " with JSON value :: " + json);
}
+ return (T)result;
+
}
}
}