svn commit: r590495 - /myfaces/core/branches/1_2_1/impl/src/main/java/org/apache/myfaces/context/servlet/ServletExternalContextImpl.java

[ma...@apache.org]

Author: matzew
Date: Tue Oct 30 15:26:32 2007
New Revision: 590495

URL: http://svn.apache.org/viewvc?rev=590495&view=rev
Log:
MYFACES-1756 - fixed some required (spec) null checks... 

Modified:
    myfaces/core/branches/1_2_1/impl/src/main/java/org/apache/myfaces/context/servlet/ServletExternalContextImpl.java

Modified: myfaces/core/branches/1_2_1/impl/src/main/java/org/apache/myfaces/context/servlet/ServletExternalContextImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/1_2_1/impl/src/main/java/org/apache/myfaces/context/servlet/ServletExternalContextImpl.java?rev=590495&r1=590494&r2=590495&view=diff
==============================================================================
--- myfaces/core/branches/1_2_1/impl/src/main/java/org/apache/myfaces/context/servlet/ServletExternalContextImpl.java (original)
+++ myfaces/core/branches/1_2_1/impl/src/main/java/org/apache/myfaces/context/servlet/ServletExternalContextImpl.java Tue Oct 30 15:26:32 2007
@@ -285,29 +285,33 @@
 
     @Override
     @SuppressWarnings("unchecked")
-    public Set<String> getResourcePaths(String s)
+    public Set<String> getResourcePaths(String path)
     {
-        return _servletContext.getResourcePaths(s);
+        checkNull(path, "path");
+        return _servletContext.getResourcePaths(path);
     }
 
     @Override
-    public InputStream getResourceAsStream(String s)
+    public InputStream getResourceAsStream(String path)
     {
-        return _servletContext.getResourceAsStream(s);
+        checkNull(path, "path");
+        return _servletContext.getResourceAsStream(path);
     }
 
     @Override
-    public String encodeActionURL(String s)
+    public String encodeActionURL(String url)
     {
+        checkNull(url, "url");
         checkHttpServletRequest();
-        return ((HttpServletResponse) _servletResponse).encodeURL(s);
+        return ((HttpServletResponse) _servletResponse).encodeURL(url);
     }
 
     @Override
-    public String encodeResourceURL(String s)
+    public String encodeResourceURL(String url)
     {
+        checkNull(url, "url");
         checkHttpServletRequest();
-        return ((HttpServletResponse) _servletResponse).encodeURL(s);
+        return ((HttpServletResponse) _servletResponse).encodeURL(url);
     }
 
     @Override
@@ -371,6 +375,7 @@
     @Override
     public boolean isUserInRole(String role)
     {
+        checkNull(role, "role");
         checkHttpServletRequest();
         return _httpServletRequest.isUserInRole(role);
     }
@@ -385,13 +390,16 @@
     @Override
     public void log(String message)
     {
+        checkNull(message, "message");
         _servletContext.log(message);
     }
 
     @Override
-    public void log(String message, Throwable t)
+    public void log(String message, Throwable exception)
     {
-        _servletContext.log(message, t);
+        checkNull(message, "message");
+        checkNull(exception, "exception");
+        _servletContext.log(message, exception);
     }
 
     @Override
@@ -416,9 +424,10 @@
     }
 
     @Override
-    public URL getResource(String s) throws MalformedURLException
+    public URL getResource(String path) throws MalformedURLException
     {
-        return _servletContext.getResource(s);
+        checkNull(path, "path");
+        return _servletContext.getResource(path);
     }
 
     /**
@@ -482,6 +491,14 @@
     public void setResponseCharacterEncoding(java.lang.String encoding)
     {
         this._servletResponse.setCharacterEncoding(encoding);
+    }
+
+    private void checkNull(Object o, String param)
+    {
+        if (o == null)
+        {
+            throw new NullPointerException(param + " can not be null.");
+        }
     }
 
     private void checkHttpServletRequest()