You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by to...@apache.org on 2015/02/16 20:06:12 UTC
[21/50] incubator-usergrid git commit: Merge branch
'two-dot-o-import' of https://github.com/snoopdave/incubator-usergrid;
branch 'two-dot-o-import' of
https://git-wip-us.apache.org/repos/asf/incubator-usergrid into
two-dot-o-import
Merge branch 'two-dot-o-import' of https://github.com/snoopdave/incubator-usergrid; branch 'two-dot-o-import' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o-import
Conflicts:
stack/services/src/test/java/org/apache/usergrid/management/importer/ImportCollectionIT.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/560f7b6d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/560f7b6d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/560f7b6d
Branch: refs/heads/USERGRID-273
Commit: 560f7b6deba58e287e9bdba4b07d97eeeaf60629
Parents: d3bd08a be7789e
Author: Dave Johnson <dm...@apigee.com>
Authored: Wed Feb 11 18:14:21 2015 -0500
Committer: Dave Johnson <dm...@apigee.com>
Committed: Wed Feb 11 18:14:21 2015 -0500
----------------------------------------------------------------------
.../imports/FileIncludesResource.java | 1 -
.../applications/imports/ImportsResource.java | 1 -
.../rest/management/ImportResourceIT.java | 11 +++++++
.../management/importer/ImportService.java | 2 +-
.../management/importer/ImportServiceImpl.java | 34 ++++++++++++--------
.../management/importer/ImportCollectionIT.java | 2 +-
.../management/importer/ImportServiceIT.java | 23 +++++++------
7 files changed, 45 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/560f7b6d/stack/rest/src/test/java/org/apache/usergrid/rest/management/ImportResourceIT.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/560f7b6d/stack/services/src/main/java/org/apache/usergrid/management/importer/ImportServiceImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/560f7b6d/stack/services/src/test/java/org/apache/usergrid/management/importer/ImportCollectionIT.java
----------------------------------------------------------------------
diff --cc stack/services/src/test/java/org/apache/usergrid/management/importer/ImportCollectionIT.java
index 7f11501,54bfc1a..fd6e11d
--- a/stack/services/src/test/java/org/apache/usergrid/management/importer/ImportCollectionIT.java
+++ b/stack/services/src/test/java/org/apache/usergrid/management/importer/ImportCollectionIT.java
@@@ -460,12 -439,10 +460,12 @@@ public class ImportCollectionIT
- int maxRetries = 120;
+ int maxRetries = 60;
int retries = 0;
- while ( (!importService.getState( importEntity.getUuid() ).equals( Import.State.FAILED) &&
- !importService.getState( importEntity.getUuid() ).equals( Import.State.FINISHED )) && retries++ < maxRetries ) {
+ while ( !importService.getState( importEntity.getUuid() ).equals( "FINISHED" )
+ && !importService.getState( importEntity.getUuid() ).equals( "FAILED" )
+ && retries++ < maxRetries ) {
-
++
logger.debug("Waiting for import...");
Thread.sleep(1000);
}