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

TemplateImageResolver was being passed a null FacesContext. Default image no longer cached should no context be available.

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6140 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Mike Hatfield
2007-07-03 11:13:24 +00:00
parent 95f471758e
commit 67c98df8d3
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/java/org/alfresco/web/scripts/DeclarativeWebScriptRegistry.java
View File

@@ -140,7 +140,7 @@ public class DeclarativeWebScriptRegistry extends AbstractLifecycleBean
{ {
public String resolveImagePathForName(String filename, FileTypeImageSize size) public String resolveImagePathForName(String filename, FileTypeImageSize size)
{ {
return Utils.getFileTypeImage(FacesContext.getCurrentInstance(), filename, size); return Utils.getFileTypeImage(servletContext, filename, size);
} }
}; };
} }

5
source/java/org/alfresco/web/ui/common/Utils.java
View File

@@ -1285,6 +1285,11 @@ public final class Utils
// found the image for this extension - save it for later // found the image for this extension - save it for later
s_fileExtensionMap.put(key, image); s_fileExtensionMap.put(key, image);
} }
else if ((fc == null) && (sc == null))
{
// we have neither FacesContext nor ServerContext so return the default image but don't cache it
image = defaultImage;
}
else else
{ {
// not found, save the default image for this extension instead // not found, save the default image for this extension instead