From 57c962e82aed7cbd44c28a25f20687164a6b2603 Mon Sep 17 00:00:00 2001 From: j2blake Date: Fri, 7 Jun 2013 16:22:33 -0400 Subject: [PATCH] VIVO-82 FileServingServlet must use an existing WADF. Request-specific WebappDaoFactory objects are not initialized on image requests. --- .../webapp/filestorage/serving/FileServingServlet.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/filestorage/serving/FileServingServlet.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/filestorage/serving/FileServingServlet.java index 388b71e38..defd15a54 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/filestorage/serving/FileServingServlet.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/filestorage/serving/FileServingServlet.java @@ -87,19 +87,19 @@ public class FileServingServlet extends VitroHttpServlet { InputStream in; String mimeType = null; try { - FileInfo fileInfo = figureFileInfo( - request.getFullWebappDaoFactory(), path); + FileInfo fileInfo = figureFileInfo(request.getWebappDaoFactory(), + path); mimeType = fileInfo.getMimeType(); String actualFilename = findAndValidateFilename(fileInfo, path); in = openImageInputStream(fileInfo, actualFilename); } catch (FileServingException e) { - log.info("Failed to serve the file at '" + path + "' -- " + e.getMessage()); + log.info("Failed to serve the file at '" + path + "' -- " + e); in = openMissingLinkImage(request); mimeType = "image/png"; } catch (Exception e) { - log.warn("Failed to serve the file at '" + path + "' -- " + e.getMessage()); + log.warn("Failed to serve the file at '" + path + "' -- " + e); in = openMissingLinkImage(request); mimeType = "image/png"; }