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:57 UTC
[61/95] [abbrv] git commit: added fix for correctly maintaining
metadata about the job incase of failure
added fix for correctly maintaining metadata about the job incase of failure
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/db69a4eb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/db69a4eb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/db69a4eb
Branch: refs/heads/import-feature
Commit: db69a4eb386a53130442d6cbef2fbc104fca671b
Parents: 04e13e6
Author: Pooja Jain <pj...@apigee.com>
Authored: Mon Jul 28 10:46:38 2014 -0700
Committer: Pooja Jain <pj...@apigee.com>
Committed: Mon Jul 28 10:46:38 2014 -0700
----------------------------------------------------------------------
.../management/importUG/ImportServiceImpl.java | 24 +++++++++++---------
1 file changed, 13 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/db69a4eb/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 b341cda..2dcc226 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
@@ -431,18 +431,20 @@ public class ImportServiceImpl implements ImportService {
Map<String,Object> fileMetadata = new HashMap<String, Object>();
ArrayList<Map<String,Object>> value = new ArrayList<Map<String, Object>>();
- // create the structure for file metadata and initialize it
- for(File collectionFile : files) {
- Map<String,Object> singleFile = new HashMap<String, Object>();
- singleFile.put("name",collectionFile.getName());
- singleFile.put("completed",new Boolean(false));
- singleFile.put("lastUpdatedUUID",new String(""));
- value.add(singleFile);
- }
+ if (!((Map<String,Object>)importUG.getDynamicProperties()).containsKey("files")) {
+ // create the structure for file metadata and initialize it
+ for (File collectionFile : files) {
+ Map<String, Object> singleFile = new HashMap<String, Object>();
+ singleFile.put("name", collectionFile.getName());
+ singleFile.put("completed", new Boolean(false));
+ singleFile.put("lastUpdatedUUID", new String(""));
+ value.add(singleFile);
+ }
- fileMetadata.put("files",value);
- importUG.addProperties(fileMetadata);
- rootEm.update(importUG);
+ fileMetadata.put("files", value);
+ importUG.addProperties(fileMetadata);
+ rootEm.update(importUG);
+ }
ArrayList fileNames = (ArrayList)importUG.getDynamicProperties().get("files");
int i=0;