Merged HEAD-QA to HEAD (4.2) (including moving test classes into separate folders)

51903 to 54309 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@54310 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Samuel Langlois
2013-08-20 17:17:31 +00:00
parent 0a36e2af67
commit ab4ca7177f
1576 changed files with 36419 additions and 8603 deletions

View File

@@ -18,7 +18,6 @@
*/
package org.alfresco.repo.node.index;
import org.alfresco.util.PropertyCheck;
import org.quartz.Job;
import org.quartz.JobDataMap;
import org.quartz.JobExecutionContext;
@@ -35,7 +34,7 @@ import org.quartz.JobExecutionException;
public class IndexRecoveryJob implements Job
{
public static final String KEY_INDEX_RECOVERY_COMPONENT = "indexRecoveryComponent";
public static final String KEY_CLUSTER_NAME = "clusterName";
public static final String KEY_CLUSTER_ENABLED = "clusterEnabled";
/**
* Forces a full index recovery using the {@link IndexRecovery recovery component} passed
@@ -49,10 +48,10 @@ public class IndexRecoveryJob implements Job
{
throw new JobExecutionException("Missing job data: " + KEY_INDEX_RECOVERY_COMPONENT);
}
String clusterName = (String) map.get(KEY_CLUSTER_NAME);
if (!PropertyCheck.isValidPropertyString(clusterName))
boolean clusterEnabled = map.getBooleanValue(KEY_CLUSTER_ENABLED);
if (!clusterEnabled)
{
// No cluster name
// Nothing to do when clustering disabled.
return;
}
// reindex