inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fail earlier and more explicitly if 'Scheduled Actions' is not available

Browse Source 
- Avoid null NodeRef being passed around
 - Looking at http://forums.alfresco.com/en/viewtopic.php?p=102856


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@23242 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2010-10-22 23:42:59 +00:00
parent f48288b5a5
commit 1856b4eeae
1 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
source/java/org/alfresco/repo/action/scheduled/ScheduledPersistedActionServiceImpl.java
View File

@@ -25,8 +25,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
import javax.transaction.UserTransaction;
import org.alfresco.error.AlfrescoRuntimeException;
import org.alfresco.model.ContentModel;
import org.alfresco.repo.action.ActionModel;
import org.alfresco.repo.action.RuntimeActionService;
@@ -35,8 +34,8 @@ import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork;
import org.alfresco.repo.transaction.AlfrescoTransactionSupport;
import org.alfresco.repo.transaction.RetryingTransactionHelper;
import org.alfresco.repo.transaction.TransactionListenerAdapter;
import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
import org.alfresco.repo.transaction.TransactionListenerAdapter;
import org.alfresco.service.cmr.action.Action;
import org.alfresco.service.cmr.action.ActionService;
import org.alfresco.service.cmr.action.scheduled.SchedulableAction.IntervalPeriod;
@@ -128,18 +127,20 @@ public class ScheduledPersistedActionServiceImpl implements ScheduledPersistedAc
repositoryHelper.getCompanyHome(),
ContentModel.ASSOC_CONTAINS,
QName.createQName(NamespaceService.APP_MODEL_1_0_URI, "dictionary"));
if (dictionaryAssocs.size() > 0)
if (dictionaryAssocs.size() == 0)
{
NodeRef dataDictionary = dictionaryAssocs.get(0).getChildRef();
List<ChildAssociationRef> scheduledAssocs = startupNodeService.getChildAssocs(
dataDictionary,
ContentModel.ASSOC_CONTAINS,
QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "Scheduled Actions"));
if (scheduledAssocs.size() > 0)
{
SCHEDULED_ACTION_ROOT_NODE_REF = scheduledAssocs.get(0).getChildRef();
}
throw new AlfrescoRuntimeException("Failed to find 'app:dictionary' node");
}
NodeRef dataDictionary = dictionaryAssocs.get(0).getChildRef();
List<ChildAssociationRef> scheduledAssocs = startupNodeService.getChildAssocs(
dataDictionary,
ContentModel.ASSOC_CONTAINS,
QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "Scheduled Actions"));
if (scheduledAssocs.size() == 0)
{
throw new AlfrescoRuntimeException("Failed to find 'cm:Scheduled Actions' location.");
}
SCHEDULED_ACTION_ROOT_NODE_REF = scheduledAssocs.get(0).getChildRef();
}
/**