You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by aw...@apache.org on 2007/05/22 22:58:37 UTC

svn commit: r540750 - /myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/MFacesContext.java

Author: awiner
Date: Tue May 22 13:58:36 2007
New Revision: 540750

URL: http://svn.apache.org/viewvc?view=rev&rev=540750
Log:
TRINIDAD-15: RenderKit test framework should catch ExternalContext.encodeAction/ResourceURL(null)

Modified:
    myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/MFacesContext.java

Modified: myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/MFacesContext.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/MFacesContext.java?view=diff&rev=540750&r1=540749&r2=540750
==============================================================================
--- myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/MFacesContext.java (original)
+++ myfaces/trinidad/trunk/trinidad/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/MFacesContext.java Tue May 22 13:58:36 2007
@@ -256,16 +256,21 @@
     @Override
     public String encodeResourceURL(String url)
     {
+      // The spec requires encodeResourceURL() to throw NPE here,
+      // though not all impls do
       if (url == null)
-        return null;
+        throw new NullPointerException("encodeResourceURL called with null URL");
       return "encoded-resource-url:" + url;
     }
     
     @Override
     public String encodeActionURL(String url)
     {
+      // The spec requires encodeActionURL() to throw NPE here,
+      // though not all impls do
       if (url == null)
-        return null;
+        throw new NullPointerException("encodeActionURL called with null URL");
+
       return "encoded-action-url:" + url;
     }