Merged DEV to HEAD (5.0.0)

87647: ACE-3047 : Bulk Import Tool: Status page is not refreshed automatically during import process
      - Ensure that bulk import started before redirecting client to the status page.
   87648: ACE-3048 : Bulk Import Tool: IE: Script error on Bulk Filesystem In-place Import Tool page - 'YUI' is undefined
      - Missing javascript resource.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@87748 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Pavel Yurke
2014-10-10 14:11:33 +00:00
parent 80aab65e53
commit 1f5b674c5f

View File

@@ -162,6 +162,17 @@ public class BulkFilesystemImportWebScript extends AbstractBulkFileSystemImportW
bulkImporter.asyncBulkImport(bulkImportParameters, nodeImporter);
// ACE-3047 fix, since bulk import is started asynchronously there is a chance that client
// will get into the status page before import is actually started.
// In this case wrong information (for previous import) will be displayed.
// So lets ensure that import started before redirecting client to status page.
int i = 0;
while (!bulkImporter.getStatus().inProgress() && i < 10)
{
Thread.sleep(100);
i++;
}
// redirect to the status Web Script
status.setCode(Status.STATUS_MOVED_TEMPORARILY);
status.setRedirect(true);