mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4/root@4975 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4/root@4979 .
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5033 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -59,6 +59,7 @@ public class ClientConfigElement extends ConfigElementAdapter
|
||||
private ExpiringValueCache<String> wcmDomain = new ExpiringValueCache(1000*10L);
|
||||
private ExpiringValueCache<String> wcmPort = new ExpiringValueCache(1000*10L);
|
||||
private String defaultHomeSpacePath = "/app:company_home";
|
||||
private boolean allowGuestConfig = false;
|
||||
|
||||
/**
|
||||
* Default Constructor
|
||||
@@ -180,6 +181,11 @@ public class ClientConfigElement extends ConfigElementAdapter
|
||||
combinedElement.setInitialLocation(newElement.getInitialLocation());
|
||||
}
|
||||
|
||||
if (newElement.getAllowGuestConfig() != combinedElement.getAllowGuestConfig())
|
||||
{
|
||||
combinedElement.setAllowGuestConfig(newElement.getAllowGuestConfig());
|
||||
}
|
||||
|
||||
return combinedElement;
|
||||
}
|
||||
|
||||
@@ -480,4 +486,14 @@ public class ClientConfigElement extends ConfigElementAdapter
|
||||
}
|
||||
return value;
|
||||
}
|
||||
|
||||
/*package*/ void setAllowGuestConfig(boolean allow)
|
||||
{
|
||||
this.allowGuestConfig = allow;
|
||||
}
|
||||
|
||||
public boolean getAllowGuestConfig()
|
||||
{
|
||||
return this.allowGuestConfig;
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user