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

. Fix for AWC-555

Browse Source 
- Space Selector now no longer attempts to disable spaces that a user cannot read
 - Was assuming Company Home was accessable
. Label change: "Content Templates" now reads "Presentation Templates"
. Fix for DownloadContentServlet to display normal error JSP page if content is deleted before viewing occurs
. Removal of erronous character in SystemErrorTag

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2459 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2006-02-21 19:25:01 +00:00
parent d50e2cf700
commit ad01ff846f
6 changed files with 190 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
source/java/org/alfresco/web/bean/repository/Repository.java
View File

@@ -82,9 +82,12 @@ public final class Repository
/** reference to System folder */
private static NodeRef systemRef = null;
/** reference to the namespace service */
/** reference to the NamespaceService */
private static NamespaceService namespaceService = null;
/** reference to the ServiceRegistry */
private static ServiceRegistry serviceRegistry = null;
/**
* Private constructor
*/
@@ -411,8 +414,12 @@ public final class Repository
*/
public static ServiceRegistry getServiceRegistry(FacesContext context)
{
return (ServiceRegistry)FacesContextUtils.getRequiredWebApplicationContext(
context).getBean(ServiceRegistry.SERVICE_REGISTRY);
if (serviceRegistry == null)
{
serviceRegistry = (ServiceRegistry)FacesContextUtils.getRequiredWebApplicationContext(
context).getBean(ServiceRegistry.SERVICE_REGISTRY);
}
return serviceRegistry;
}
/**
@@ -423,8 +430,12 @@ public final class Repository
*/
public static ServiceRegistry getServiceRegistry(ServletContext context)
{
return (ServiceRegistry)WebApplicationContextUtils.getRequiredWebApplicationContext(
context).getBean(ServiceRegistry.SERVICE_REGISTRY);
if (serviceRegistry == null)
{
serviceRegistry = (ServiceRegistry)WebApplicationContextUtils.getRequiredWebApplicationContext(
context).getBean(ServiceRegistry.SERVICE_REGISTRY);
}
return serviceRegistry;
}
/**