You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ss...@apache.org on 2018/07/31 10:51:13 UTC
[sling-org-apache-sling-testing-sling-mock] branch master updated:
SLING-7687 Some Adapters don't work during service deactivation (patch
provided by Arneh Jain)
This is an automated email from the ASF dual-hosted git repository.
sseifert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock.git
The following commit(s) were added to refs/heads/master by this push:
new 944c001 SLING-7687 Some Adapters don't work during service deactivation (patch provided by Arneh Jain)
944c001 is described below
commit 944c00112bc64a103715d06c3bbb53723fe57020
Author: sseifert <ss...@pro-vision.de>
AuthorDate: Tue Jul 31 12:50:12 2018 +0200
SLING-7687 Some Adapters don't work during service deactivation (patch provided by Arneh Jain)
---
.../org/apache/sling/testing/mock/sling/context/SlingContextImpl.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
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 0de9eb4..f379178 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
@@ -212,8 +212,6 @@ public class SlingContextImpl extends OsgiContextImpl {
this.resourceResolver.close();
}
- MockSling.clearAdapterManagerBundleContext();
-
this.resourceResolver = null;
this.request = null;
this.response = null;
@@ -226,6 +224,8 @@ public class SlingContextImpl extends OsgiContextImpl {
this.resourceResolverFactory = null;
super.tearDown();
+
+ MockSling.clearAdapterManagerBundleContext();
}
/**