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

Merged V3.1 to HEAD

Browse Source 
13158: Added PropertyCheck.isValidPropertyString and fixed related checks
   13159: Missed file for rev 13158: PropertyCheck.isValidPropertyString
   13160: Fixed ETHREEOH-1281: JGroups default protocol mapping must be switchable
   13163: Complete fix for ETHREEOH-1277 - add new custom JSP tag
   ___________________________________________________________________
   Modified: svn:mergeinfo
      Merged /alfresco/BRANCHES/V3.1:r13158-13160,13163


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13604 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2009-03-12 14:50:03 +00:00
parent be54a05c8e
commit 8ff478a98b
5 changed files with 45 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/java/org/alfresco/repo/jgroups/AlfrescoJGroupsChannelFactory.java
View File

@@ -39,6 +39,7 @@ import java.util.concurrent.locks.ReentrantReadWriteLock.WriteLock;
import org.alfresco.error.AlfrescoRuntimeException;
import org.alfresco.util.AbstractLifecycleBean;
import org.alfresco.util.PropertyCheck;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.jgroups.Address;
@@ -269,7 +270,7 @@ public class AlfrescoJGroupsChannelFactory extends AbstractLifecycleBean
JChannelFactory channelFactory = getChannelFactory();
// Get the protocol stack to use
String stack = stacksByAppRegion.get(appRegion);
if (stack == null)
if (!PropertyCheck.isValidPropertyString(stack))
{
stack = stacksByAppRegion.get(AlfrescoJGroupsChannelFactory.APP_REGION_DEFAULT);
}
@@ -449,7 +450,7 @@ public class AlfrescoJGroupsChannelFactory extends AbstractLifecycleBean
writeLock.lock();
try
{
if (clusterNamePrefix == null || clusterNamePrefix.trim().length() == 0 || clusterNamePrefix.startsWith("${"))
if (!PropertyCheck.isValidPropertyString(clusterNamePrefix))
{
// Clear everything out
AlfrescoJGroupsChannelFactory.clusterNamePrefix = null;
@@ -498,6 +499,13 @@ public class AlfrescoJGroupsChannelFactory extends AbstractLifecycleBean
public static void changeJgroupsConfigurationUrl(String configUrl)
{
writeLock.lock();
if (!PropertyCheck.isValidPropertyString(configUrl))
{
// It's not really being set
AlfrescoJGroupsChannelFactory.configUrl = null;
return;
}
// It's a real attempt to set it
try
{
AlfrescoJGroupsChannelFactory.configUrl = ResourceUtils.getURL(configUrl);