[sling-org-apache-sling-testing-sling-mock] 21/37: SLING-5067 fix cleanup issue with "uniqueRoot" feature

[ro...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to annotated tag org.apache.sling.testing.sling-mock-1.6.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git

commit d795bccee0d1054ca472b5d039ff5ddb30331f0a
Author: Stefan Seifert <ss...@apache.org>
AuthorDate: Tue Sep 29 07:53:37 2015 +0000

    SLING-5067 fix cleanup issue with "uniqueRoot" feature
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/mocks/sling-mock@1705808 13f79535-47bb-0310-9956-ffa450edef68
---
 .../apache/sling/testing/mock/sling/context/SlingContextImpl.java    | 5 +++++
 .../java/org/apache/sling/testing/mock/sling/context/UniqueRoot.java | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/apache/sling/testing/mock/sling/context/SlingContextImpl.java b/src/main/java/org/apache/sling/testing/mock/sling/context/SlingContextImpl.java
index 8c31c06..76439f0 100644
--- a/src/main/java/org/apache/sling/testing/mock/sling/context/SlingContextImpl.java
+++ b/src/main/java/org/apache/sling/testing/mock/sling/context/SlingContextImpl.java
@@ -167,6 +167,7 @@ public class SlingContextImpl extends OsgiContextImpl {
         this.slingScriptHelper = null;
         this.contentLoader = null;
         this.contentBuilder = null;
+        this.uniqueRoot = null;
 
         MockSling.clearAdapterManagerBundleContext();
         
@@ -315,6 +316,10 @@ public class SlingContextImpl extends OsgiContextImpl {
         }
     }
     
+    /**
+     * Create unique root paths for unit tests (and clean them up after the test run automatically).
+     * @return Unique root path helper
+     */
     public UniqueRoot uniqueRoot() {
         if (uniqueRoot == null) {
             uniqueRoot = new UniqueRoot(this);
diff --git a/src/main/java/org/apache/sling/testing/mock/sling/context/UniqueRoot.java b/src/main/java/org/apache/sling/testing/mock/sling/context/UniqueRoot.java
index 471c657..39bc2cc 100644
--- a/src/main/java/org/apache/sling/testing/mock/sling/context/UniqueRoot.java
+++ b/src/main/java/org/apache/sling/testing/mock/sling/context/UniqueRoot.java
@@ -122,7 +122,7 @@ public class UniqueRoot {
      */
     protected final void deleteResources(Resource... resources) {
         for (Resource resource : resources) {
-            if (resource != null) {
+            if (resource != null && context.resourceResolver.getResource(resource.getPath()) != null) {
                 try {
                     context.resourceResolver().delete(resource);
                 }

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.