This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.testing.resourceresolver-mock-1.1.10 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-resourceresolver-mock.git
commit 71377da29e546990fa42ff0e1b32fb1e16967633 Author: Stefan Seifert <[email protected]> AuthorDate: Mon Feb 2 11:36:54 2015 +0000 SLING-4376 ResourceResolver.resolve(null) should resolve to root resource git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/mocks/resourceresolver-mock@1656443 13f79535-47bb-0310-9956-ffa450edef68 --- .../sling/testing/resourceresolver/MockResourceResolver.java | 3 +++ .../testing/resourceresolver/SlingCrudResourceResolverTest.java | 7 +++++++ 2 files changed, 10 insertions(+) diff --git a/src/main/java/org/apache/sling/testing/resourceresolver/MockResourceResolver.java b/src/main/java/org/apache/sling/testing/resourceresolver/MockResourceResolver.java index fb09ba9..d17a782 100644 --- a/src/main/java/org/apache/sling/testing/resourceresolver/MockResourceResolver.java +++ b/src/main/java/org/apache/sling/testing/resourceresolver/MockResourceResolver.java @@ -75,6 +75,9 @@ public class MockResourceResolver extends SlingAdaptable implements ResourceReso @Override public Resource resolve(final HttpServletRequest request, final String absPath) { String path = absPath; + if (path == null) { + path = "/"; + } // split off query string or fragment that may be appendend to the URL String urlRemainder = null; diff --git a/src/test/java/org/apache/sling/testing/resourceresolver/SlingCrudResourceResolverTest.java b/src/test/java/org/apache/sling/testing/resourceresolver/SlingCrudResourceResolverTest.java index 534de79..e3020fc 100644 --- a/src/test/java/org/apache/sling/testing/resourceresolver/SlingCrudResourceResolverTest.java +++ b/src/test/java/org/apache/sling/testing/resourceresolver/SlingCrudResourceResolverTest.java @@ -222,4 +222,11 @@ public class SlingCrudResourceResolverTest { assertEquals(STRING_VALUE, propValue); } + @Test + public void testGetRootResourceByNullPath() { + Resource rootResource = this.resourceResolver.resolve((String)null); + assertNotNull(rootResource); + assertEquals("/", rootResource.getPath()); + } + } -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
