You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2015/01/07 17:21:26 UTC
svn commit: r1650102 - in /myfaces/tobago/trunk: ./
tobago-core/src/main/java/org/apache/myfaces/tobago/servlet/ResourceServlet.java
Author: lofwyr
Date: Wed Jan 7 16:21:26 2015
New Revision: 1650102
URL: http://svn.apache.org/r1650102
Log:
Merged from tobago-3.0.x
TOBAGO-1436: ResourceServlet should not render an error page (only the status) [from revision 1650101]
Modified:
myfaces/tobago/trunk/ (props changed)
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/servlet/ResourceServlet.java
Propchange: myfaces/tobago/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 7 16:21:26 2015
@@ -1,2 +1,3 @@
/myfaces/tobago/branches/tobago-1.5.x:1356585,1357124
+/myfaces/tobago/branches/tobago-3.0.x:1650101
/myfaces/tobago/branches/tobago-tree-table:1226794-1341423
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/servlet/ResourceServlet.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/servlet/ResourceServlet.java?rev=1650102&r1=1650101&r2=1650102&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/servlet/ResourceServlet.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/servlet/ResourceServlet.java Wed Jan 7 16:21:26 2015
@@ -164,7 +164,7 @@ public class ResourceServlet extends Htt
} else {
final String message = "Unsupported mime type of resource='" + resource + "'";
LOG.warn(message + " (because of security reasons)");
- response.sendError(HttpServletResponse.SC_FORBIDDEN, message);
+ response.setStatus(HttpServletResponse.SC_FORBIDDEN);
return;
}
@@ -185,7 +185,7 @@ public class ResourceServlet extends Htt
} else {
final String message = "Resource '" + resource + "' not found!";
LOG.warn(message);
- response.sendError(HttpServletResponse.SC_NOT_FOUND, message);
+ response.setStatus(HttpServletResponse.SC_NOT_FOUND);
}
} finally {
IoUtils.closeQuietly(inputStream);