You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by vi...@apache.org on 2013/09/13 19:23:13 UTC
[4/5] git commit: fixed merge anomaly error
fixed merge anomaly error
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/commit/6bd367c5
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/tree/6bd367c5
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/diff/6bd367c5
Branch: refs/heads/master
Commit: 6bd367c5120f54955a4e52874d273c340ec9dd28
Parents: 6eaa2ef
Author: purplecabbage <pu...@gmail.com>
Authored: Thu Sep 12 17:24:09 2013 -0700
Committer: purplecabbage <pu...@gmail.com>
Committed: Thu Sep 12 17:24:09 2013 -0700
----------------------------------------------------------------------
src/wp/FileTransfer.cs | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-file-transfer/blob/6bd367c5/src/wp/FileTransfer.cs
----------------------------------------------------------------------
diff --git a/src/wp/FileTransfer.cs b/src/wp/FileTransfer.cs
index ff21b85..6cc1e1f 100644
--- a/src/wp/FileTransfer.cs
+++ b/src/wp/FileTransfer.cs
@@ -325,11 +325,8 @@ namespace WPCordovaClassLib.Cordova.Commands
string temp = jsonHeaders.StartsWith("{") ? jsonHeaders.Substring(1) : jsonHeaders;
temp = temp.EndsWith("}") ? temp.Substring(0, temp.Length - 1) : temp;
- string[] strHeaders = temp.Split(',');
- for (int n = 0; n < strHeaders.Length; n++)
- {
- string[] split = strHeaders[n].Split(":".ToCharArray(), 2);
- if (split.Length == 2)
+ string[] strHeaders = temp.Split(',');
+ for (int n = 0; n < strHeaders.Length; n++)
{
string[] split = strHeaders[n].Split(':');
if (split.Length == 2)
@@ -338,6 +335,8 @@ namespace WPCordovaClassLib.Cordova.Commands
split[1] = JSON.JsonHelper.Deserialize<string>(split[1]);
result[split[0]] = split[1];
}
+
+
}
return result;
}
@@ -349,6 +348,7 @@ namespace WPCordovaClassLib.Cordova.Commands
}
+
public void download(string options)
{
TransferOptions downloadOptions = null;