From 67c98df8d3b4947b3388c11989bdba14a8f16a13 Mon Sep 17 00:00:00 2001 From: Mike Hatfield Date: Tue, 3 Jul 2007 11:13:24 +0000 Subject: [PATCH] TemplateImageResolver was being passed a null FacesContext. Default image no longer cached should no context be available. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6140 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../alfresco/web/scripts/DeclarativeWebScriptRegistry.java | 2 +- source/java/org/alfresco/web/ui/common/Utils.java | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/source/java/org/alfresco/web/scripts/DeclarativeWebScriptRegistry.java b/source/java/org/alfresco/web/scripts/DeclarativeWebScriptRegistry.java index a9baeae517..f00cd37b26 100644 --- a/source/java/org/alfresco/web/scripts/DeclarativeWebScriptRegistry.java +++ b/source/java/org/alfresco/web/scripts/DeclarativeWebScriptRegistry.java @@ -140,7 +140,7 @@ public class DeclarativeWebScriptRegistry extends AbstractLifecycleBean { public String resolveImagePathForName(String filename, FileTypeImageSize size) { - return Utils.getFileTypeImage(FacesContext.getCurrentInstance(), filename, size); + return Utils.getFileTypeImage(servletContext, filename, size); } }; } diff --git a/source/java/org/alfresco/web/ui/common/Utils.java b/source/java/org/alfresco/web/ui/common/Utils.java index 6da1ccfdf4..c423d334a7 100644 --- a/source/java/org/alfresco/web/ui/common/Utils.java +++ b/source/java/org/alfresco/web/ui/common/Utils.java @@ -1285,6 +1285,11 @@ public final class Utils // found the image for this extension - save it for later 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 { // not found, save the default image for this extension instead