svn commit: r1631326 - in /sling/trunk/testing/resourceresolver-mock/src: main/java/org/apache/sling/testing/resourceresolver/MockResourceResolver.java test/java/org/apache/sling/testing/resourceresolver/SlingCrudResourceResolverTest.java

[ss...@apache.org]

Author: sseifert
Date: Mon Oct 13 09:58:40 2014
New Revision: 1631326

URL: http://svn.apache.org/r1631326
Log:
SLING-4040 Return null for getResource für null path

Modified:
    sling/trunk/testing/resourceresolver-mock/src/main/java/org/apache/sling/testing/resourceresolver/MockResourceResolver.java
    sling/trunk/testing/resourceresolver-mock/src/test/java/org/apache/sling/testing/resourceresolver/SlingCrudResourceResolverTest.java

Modified: sling/trunk/testing/resourceresolver-mock/src/main/java/org/apache/sling/testing/resourceresolver/MockResourceResolver.java
URL: http://svn.apache.org/viewvc/sling/trunk/testing/resourceresolver-mock/src/main/java/org/apache/sling/testing/resourceresolver/MockResourceResolver.java?rev=1631326&r1=1631325&r2=1631326&view=diff
==============================================================================
--- sling/trunk/testing/resourceresolver-mock/src/main/java/org/apache/sling/testing/resourceresolver/MockResourceResolver.java (original)
+++ sling/trunk/testing/resourceresolver-mock/src/main/java/org/apache/sling/testing/resourceresolver/MockResourceResolver.java Mon Oct 13 09:58:40 2014
@@ -127,7 +127,7 @@ public class MockResourceResolver extend
         Resource resource = getResourceInternal(path);
         
         // if not resource found check if this is a reference to a property
-        if (resource == null) {
+        if (resource == null && path != null) {
             String name = ResourceUtil.getName(path);
             String parentPath = ResourceUtil.getParent(path);
             Resource parentResource = getResourceInternal(parentPath);
@@ -143,6 +143,10 @@ public class MockResourceResolver extend
     }
     
     private Resource getResourceInternal(final String path) {
+        if (path == null) {
+            return null;
+        }
+        
         String normalizedPath = ResourceUtil.normalize(path);
         if ( normalizedPath.startsWith("/") ) {
             if ( this.deletedResources.contains(normalizedPath) ) {

Modified: sling/trunk/testing/resourceresolver-mock/src/test/java/org/apache/sling/testing/resourceresolver/SlingCrudResourceResolverTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/testing/resourceresolver-mock/src/test/java/org/apache/sling/testing/resourceresolver/SlingCrudResourceResolverTest.java?rev=1631326&r1=1631325&r2=1631326&view=diff
==============================================================================
--- sling/trunk/testing/resourceresolver-mock/src/test/java/org/apache/sling/testing/resourceresolver/SlingCrudResourceResolverTest.java (original)
+++ sling/trunk/testing/resourceresolver-mock/src/test/java/org/apache/sling/testing/resourceresolver/SlingCrudResourceResolverTest.java Mon Oct 13 09:58:40 2014
@@ -21,6 +21,7 @@ package org.apache.sling.testing.resourc
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
@@ -33,7 +34,6 @@ import org.apache.commons.io.IOUtils;
 import org.apache.jackrabbit.util.ISO8601;
 import org.apache.sling.api.resource.LoginException;
 import org.apache.sling.api.resource.ModifiableValueMap;
-import org.apache.sling.api.resource.PersistenceException;
 import org.apache.sling.api.resource.Resource;
 import org.apache.sling.api.resource.ResourceResolver;
 import org.apache.sling.api.resource.ResourceUtil;
@@ -177,13 +177,13 @@ public class SlingCrudResourceResolverTe
     }
 
     @Test
-    public void testPrimaryTypeResourceType() throws PersistenceException {
+    public void testPrimaryTypeResourceType() {
         Resource resource1 = resourceResolver.getResource(testRoot.getPath() + "/node1");
         assertEquals(NT_UNSTRUCTURED, resource1.getResourceType());
     }
 
     @Test
-    public void testNormalizePath() throws PersistenceException {
+    public void testNormalizePath() {
         Resource resource1 = resourceResolver.getResource(testRoot.getPath() + "/./node1");
         assertEquals("node1", resource1.getName());
 
@@ -191,4 +191,10 @@ public class SlingCrudResourceResolverTe
         assertEquals("node11", resource11.getName());
     }
 
+    @Test
+    public void testGetResourceNullPath() {
+        Resource resource = resourceResolver.getResource((String)null);
+        assertNull(resource);
+    }
+
 }