You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2014/08/22 16:15:52 UTC
[56/95] [abbrv] git commit: fixed json parser
fixed json parser
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/459f1444
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/459f1444
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/459f1444
Branch: refs/heads/import-feature
Commit: 459f1444b5862dfbeeb6bf5440a71bad82deeb57
Parents: 1e3315b
Author: Pooja Jain <Ap...@Pooja-Jains-MacBook-Pro.local>
Authored: Fri Jul 25 10:35:13 2014 -0700
Committer: Pooja Jain <Ap...@Pooja-Jains-MacBook-Pro.local>
Committed: Fri Jul 25 10:35:13 2014 -0700
----------------------------------------------------------------------
portal/config.js | 2 +-
.../org/apache/usergrid/management/importUG/ImportServiceImpl.java | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/459f1444/portal/config.js
----------------------------------------------------------------------
diff --git a/portal/config.js b/portal/config.js
index 8adb6e8..cbd8166 100644
--- a/portal/config.js
+++ b/portal/config.js
@@ -4,7 +4,7 @@ Usergrid.showNotifcations = true;
// used only if hostname does not match a real server name
-Usergrid.overrideUrl = 'http://import.usergrid.com/';
+Usergrid.overrideUrl = 'http://importtest2.usergrid.com/';
Usergrid.options = {
client:{
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/459f1444/stack/services/src/main/java/org/apache/usergrid/management/importUG/ImportServiceImpl.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/management/importUG/ImportServiceImpl.java b/stack/services/src/main/java/org/apache/usergrid/management/importUG/ImportServiceImpl.java
index e47087e..729cce7 100644
--- a/stack/services/src/main/java/org/apache/usergrid/management/importUG/ImportServiceImpl.java
+++ b/stack/services/src/main/java/org/apache/usergrid/management/importUG/ImportServiceImpl.java
@@ -456,6 +456,7 @@ public class ImportServiceImpl implements ImportService {
if(!completed) {
if(!isValidJSON(collectionFile, fileInfo)){
+ i++;
continue;
}