You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by pa...@apache.org on 2018/01/11 18:36:09 UTC

svn commit: r1820907 - in /myfaces/core/branches/2.3.x/impl/src: main/java/org/apache/myfaces/application/ResourceHandlerImpl.java test/java/org/apache/myfaces/application/ResourceHandlerImplTest.java

Author: paulnicolucci
Date: Thu Jan 11 18:36:09 2018
New Revision: 1820907

URL: http://svn.apache.org/viewvc?rev=1820907&view=rev
Log:
MYFACES-4187: throw NPE with null resourceName

Modified:
    myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/application/ResourceHandlerImpl.java
    myfaces/core/branches/2.3.x/impl/src/test/java/org/apache/myfaces/application/ResourceHandlerImplTest.java

Modified: myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/application/ResourceHandlerImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/application/ResourceHandlerImpl.java?rev=1820907&r1=1820906&r2=1820907&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/application/ResourceHandlerImpl.java (original)
+++ myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/application/ResourceHandlerImpl.java Thu Jan 11 18:36:09 2018
@@ -138,10 +138,16 @@ public class ResourceHandlerImpl extends
     {
         Resource resource = null;
         
-        if (resourceName == null || resourceName.length() == 0) 
+        if (resourceName == null) 
+        {
+            throw new NullPointerException();
+        }
+
+        if (resourceName.length() == 0)
         {
             return null;
         }
+
         if (resourceName.charAt(0) == '/')
         {
             // If resourceName starts with '/', remove that character because it

Modified: myfaces/core/branches/2.3.x/impl/src/test/java/org/apache/myfaces/application/ResourceHandlerImplTest.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/impl/src/test/java/org/apache/myfaces/application/ResourceHandlerImplTest.java?rev=1820907&r1=1820906&r2=1820907&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/impl/src/test/java/org/apache/myfaces/application/ResourceHandlerImplTest.java (original)
+++ myfaces/core/branches/2.3.x/impl/src/test/java/org/apache/myfaces/application/ResourceHandlerImplTest.java Thu Jan 11 18:36:09 2018
@@ -221,4 +221,19 @@ public class ResourceHandlerImplTest ext
         Assert.assertNull(resource.getResourceVersion());        
         Assert.assertEquals("myres.js", resource.getResourceName());
     }
+
+    @Test
+    public void testCreateResourceNullResourceName() throws Exception
+    {
+        boolean didNPEOccur = false;
+        try 
+        {
+            resourceHandler.createResource(null);
+        } catch (NullPointerException e)
+        {
+            didNPEOccur = true;
+        }
+        
+        Assert.assertTrue(didNPEOccur);
+    }
 }