Author: sdumitriu Date: 2008-01-07 14:15:17 +0100 (Mon, 07 Jan 2008) New Revision: 6639
Modified: xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/web/SkinAction.java Log: XWIKI-348: XWiki does not work with java security on Fixed some more code causing problems Modified: xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/web/SkinAction.java =================================================================== --- xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/web/SkinAction.java 2008-01-07 12:02:24 UTC (rev 6638) +++ xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/web/SkinAction.java 2008-01-07 13:15:17 UTC (rev 6639) @@ -181,8 +181,14 @@ XWiki xwiki = context.getWiki(); XWikiResponse response = context.getResponse(); try { + String path = "/skins/" + skin + "/" + filename; + byte[] data; + try { + data = context.getWiki().getResourceContentAsBytes(path); + } catch (Exception ex) { + return false; + } response.setDateHeader("Expires", (new Date()).getTime() + 30 * 24 * 3600 * 1000L); - String path = "/skins/" + skin + "/" + filename; // Choose the right content type String mimetype = context.getEngineContext().getMimeType(filename.toLowerCase()); if (mimetype != null) @@ -191,7 +197,6 @@ response.setContentType("application/octet-stream"); // Sending the content of the file - byte[] data = context.getWiki().getResourceContentAsBytes(path); if (data == null || data.length == 0) return false; _______________________________________________ notifications mailing list notifications@xwiki.org http://lists.xwiki.org/mailman/listinfo/notifications