svn commit: r1729357 - /sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/ResourceResolverImpl.java

[cziegeler]

Author: cziegeler
Date: Tue Feb  9 10:50:02 2016
New Revision: 1729357

URL: http://svn.apache.org/viewvc?rev=1729357&view=rev
Log:
SLING-5497 : ResourceResolver#getResource(Resource, String) should handle a 
null path returned by the base resource

Modified:
    
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/ResourceResolverImpl.java

Modified: 
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/ResourceResolverImpl.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/ResourceResolverImpl.java?rev=1729357&r1=1729356&r2=1729357&view=diff
==============================================================================
--- 
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/ResourceResolverImpl.java
 (original)
+++ 
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/ResourceResolverImpl.java
 Tue Feb  9 10:50:02 2016
@@ -651,7 +651,7 @@ public class ResourceResolverImpl extend
         checkClosed();
 
         String absolutePath = path;
-        if (absolutePath != null && !absolutePath.startsWith("/") && base != 
null) {
+        if (absolutePath != null && !absolutePath.startsWith("/") && base != 
null && base.getPath() != null ) {
             absolutePath = appendToPath(base.getPath(), absolutePath);
         }