Morning merge.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@2851 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Britt Park
2006-05-11 17:01:57 +00:00
parent 6418bb6d23
commit a22ddfb666
74 changed files with 905 additions and 1190 deletions

View File

@@ -253,11 +253,14 @@ public class StoreRedirectorProxyFactory<I> implements FactoryBean, Initializing
// Only allow one store type
if (argStoreRef != null)
{
if (storeRef != null && !storeRef.equals(argStoreRef))
{
throw new ServiceException("Multiple store types are not supported - types " + storeRef + " and " + argStoreRef + " passed");
}
storeRef = argStoreRef;
// TODO: put some thought into the ramifications of allowing cross-store moves
// TODO: The test here would only have checked storerefs adjacent to each other
// if (storeRef != null && !storeRef.equals(argStoreRef))
// {
// throw new ServiceException("Multiple store types are not supported - types " + storeRef + " and " + argStoreRef + " passed");
// }
// storeRef = argStoreRef;
return argStoreRef;
}
}