You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by jw...@apache.org on 2012/08/01 18:38:20 UTC
svn commit: r1368107 -
/myfaces/trinidad/trunk/trinidad-api/src/main/java/org/apache/myfaces/trinidad/webapp/ResourceServlet.java
Author: jwaldman
Date: Wed Aug 1 16:38:20 2012
New Revision: 1368107
URL: http://svn.apache.org/viewvc?rev=1368107&view=rev
Log:
TRINIDAD-2290 Need to log the exception in each catch block of ResourceServlet._getResourceLoader()
commit version 2 patch. This removes the logging for the catch block (NoSuchMethodException) that is the expected default path.
thanks to Mark Yvanovich for the patch.
Modified:
myfaces/trinidad/trunk/trinidad-api/src/main/java/org/apache/myfaces/trinidad/webapp/ResourceServlet.java
Modified: myfaces/trinidad/trunk/trinidad-api/src/main/java/org/apache/myfaces/trinidad/webapp/ResourceServlet.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-api/src/main/java/org/apache/myfaces/trinidad/webapp/ResourceServlet.java?rev=1368107&r1=1368106&r2=1368107&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-api/src/main/java/org/apache/myfaces/trinidad/webapp/ResourceServlet.java (original)
+++ myfaces/trinidad/trunk/trinidad-api/src/main/java/org/apache/myfaces/trinidad/webapp/ResourceServlet.java Wed Aug 1 16:38:20 2012
@@ -312,7 +312,9 @@ public class ResourceServlet extends Htt
Class<?> clazz = cl.loadClass(className);
try
{
+ // check if this is a decorator first, and if not, fall back to the no-arg constructor.
Constructor<?> decorator = clazz.getConstructor(_DECORATOR_SIGNATURE);
+
// We are now calling a special temp directory version of DirectoryResourceLoader to
// assure that the servlet context's temp directory doesn't change on us.
ResourceLoader delegate = new TempDirectoryResourceLoader(getServletContext());
@@ -328,7 +330,6 @@ public class ResourceServlet extends Htt
catch (NoSuchMethodException e)
{
// by default, create new instance with no-args constructor
- _logLoaderException(e, servletPath);
loader = (ResourceLoader) clazz.newInstance();
}
}