svn commit: r1667674 - /sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/tree/ResourceProviderEntry.java

[cziegeler]

Author: cziegeler
Date: Thu Mar 19 07:41:58 2015
New Revision: 1667674

URL: http://svn.apache.org/r1667674
Log:
SLING-4518 : Exception when deleting a resource not managed by the root 
resource provider

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

Modified: 
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/tree/ResourceProviderEntry.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/tree/ResourceProviderEntry.java?rev=1667674&r1=1667673&r2=1667674&view=diff
==============================================================================
--- 
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/tree/ResourceProviderEntry.java
 (original)
+++ 
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/tree/ResourceProviderEntry.java
 Thu Mar 19 07:41:58 2015
@@ -468,7 +468,9 @@ public class ResourceProviderEntry imple
         for (ProviderHandler currentProviderHandler : viableHandlers) {
             if (currentProviderHandler.canDelete(ctx, resource)) {
                 final ModifyingResourceProvider mrp = 
(ModifyingResourceProvider) currentProviderHandler.getResourceProvider(ctx);
-                mrp.delete(resourceResolver, fullPath);
+                if ( mrp.getResource(resourceResolver, fullPath) != null ) {
+                    mrp.delete(resourceResolver, fullPath);
+                }
                 anyProviderAttempted = true;
             }
         }