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 5c7c77df63591ef43b1d755cb3376b80c9aa66dc Author: Stefan Seifert <[email protected]> AuthorDate: Fri Oct 2 17:03:22 2015 +0000 SLING-5088 update to latest osgi-mock to make sure all services are deactivated properly git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/mocks/sling-mock@1706448 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 2 +- .../apache/sling/testing/mock/sling/context/SlingContextImpl.java | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 5d6f3f8..65ec4e0 100644 --- a/pom.xml +++ b/pom.xml @@ -45,7 +45,7 @@ <dependency> <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.testing.osgi-mock</artifactId> - <version>1.5.0</version> + <version>1.5.1-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> 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 b561325..bc6f808 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 @@ -163,7 +163,8 @@ public class SlingContextImpl extends OsgiContextImpl { this.resourceResolver.close(); } - this.componentContext = null; + MockSling.clearAdapterManagerBundleContext(); + this.resourceResolver = null; this.request = null; this.response = null; @@ -171,8 +172,6 @@ public class SlingContextImpl extends OsgiContextImpl { this.contentLoader = null; this.contentBuilder = null; this.uniqueRoot = null; - - MockSling.clearAdapterManagerBundleContext(); super.tearDown(); } -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
