Author: sseifert Date: Fri Oct 2 17:03:22 2015 New Revision: 1706448 URL: http://svn.apache.org/viewvc?rev=1706448&view=rev Log: SLING-5088 update to latest osgi-mock to make sure all services are deactivated properly
Modified: sling/trunk/testing/mocks/sling-mock/pom.xml sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/context/SlingContextImpl.java Modified: sling/trunk/testing/mocks/sling-mock/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock/pom.xml?rev=1706448&r1=1706447&r2=1706448&view=diff ============================================================================== --- sling/trunk/testing/mocks/sling-mock/pom.xml (original) +++ sling/trunk/testing/mocks/sling-mock/pom.xml Fri Oct 2 17:03:22 2015 @@ -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> Modified: sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/context/SlingContextImpl.java URL: http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/context/SlingContextImpl.java?rev=1706448&r1=1706447&r2=1706448&view=diff ============================================================================== --- sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/context/SlingContextImpl.java (original) +++ sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/context/SlingContextImpl.java Fri Oct 2 17:03:22 2015 @@ -163,7 +163,8 @@ public class SlingContextImpl extends Os 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 Os this.contentLoader = null; this.contentBuilder = null; this.uniqueRoot = null; - - MockSling.clearAdapterManagerBundleContext(); super.tearDown(); }