You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by mc...@apache.org on 2009/08/27 02:57:54 UTC
svn commit: r808239 -
/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/DefaultViewHandlerSupport.java
Author: mconcini
Date: Thu Aug 27 00:57:54 2009
New Revision: 808239
URL: http://svn.apache.org/viewvc?rev=808239&view=rev
Log:
MYFACES-2334 - add a null check on viewID prior to checking if the resource exists
Modified:
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/DefaultViewHandlerSupport.java
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/DefaultViewHandlerSupport.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/DefaultViewHandlerSupport.java?rev=808239&r1=808238&r2=808239&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/DefaultViewHandlerSupport.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/DefaultViewHandlerSupport.java Thu Aug 27 00:57:54 2009
@@ -61,16 +61,9 @@
throw new InvalidViewIdException(viewId);
}
- try
+ if(viewId != null)
{
- return ((context.getExternalContext().getResource(viewId) != null) ? viewId : null);
- }
- catch (MalformedURLException e)
- {
- if (log.isErrorEnabled())
- {
- log.error("Caught malformed URL exception attempting to validate the view resource",e);
- }
+ return (checkResourceExists(context,viewId) ? viewId : null);
}
return null; // return null if no physical resource exists