You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ba...@apache.org on 2007/05/03 00:13:13 UTC
svn commit: r534632 -
/myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/application/DefaultViewHandlerSupport.java
Author: baranda
Date: Wed May 2 15:13:12 2007
New Revision: 534632
URL: http://svn.apache.org/viewvc?view=rev&rev=534632
Log:
Additional null check
Modified:
myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/application/DefaultViewHandlerSupport.java
Modified: myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/application/DefaultViewHandlerSupport.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/application/DefaultViewHandlerSupport.java?view=diff&rev=534632&r1=534631&r2=534632
==============================================================================
--- myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/application/DefaultViewHandlerSupport.java (original)
+++ myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/application/DefaultViewHandlerSupport.java Wed May 2 15:13:12 2007
@@ -18,18 +18,17 @@
*/
package org.apache.myfaces.application;
-import java.util.List;
-import java.util.Map;
-
-import javax.faces.application.ViewHandler;
-import javax.faces.context.ExternalContext;
-import javax.faces.context.FacesContext;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.myfaces.shared_impl.webapp.webxml.ServletMapping;
import org.apache.myfaces.shared_impl.webapp.webxml.WebXml;
+import javax.faces.application.ViewHandler;
+import javax.faces.context.ExternalContext;
+import javax.faces.context.FacesContext;
+import java.util.List;
+import java.util.Map;
+
/**
* @author Mathias Broekelmann (latest modification by $Author$)
* @version $Revision$ $Date$
@@ -179,6 +178,12 @@
protected String applyDefaultSuffix(FacesContext context, String viewId)
{
String defaultSuffix = getContextSuffix(context);
+
+ if (viewId == null)
+ {
+ return null;
+ }
+
if (!viewId.endsWith(defaultSuffix))
{
StringBuilder builder = new StringBuilder(viewId);