You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ie...@apache.org on 2013/02/26 06:44:18 UTC
svn commit: r1450034 -
/sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/OsgiInstallerTestBase.java
Author: ieb
Date: Tue Feb 26 05:44:17 2013
New Revision: 1450034
URL: http://svn.apache.org/r1450034
Log:
SLING-2755 Fixed.
Modified:
sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/OsgiInstallerTestBase.java
Modified: sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/OsgiInstallerTestBase.java
URL: http://svn.apache.org/viewvc/sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/OsgiInstallerTestBase.java?rev=1450034&r1=1450033&r2=1450034&view=diff
==============================================================================
--- sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/OsgiInstallerTestBase.java (original)
+++ sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/OsgiInstallerTestBase.java Tue Feb 26 05:44:17 2013
@@ -101,9 +101,11 @@ class OsgiInstallerTestBase implements F
/** Tear down everything. */
public void tearDown() {
- if (configAdminTracker != null) {
- configAdminTracker.close();
- configAdminTracker = null;
+ synchronized (this) {
+ if (configAdminTracker != null) {
+ configAdminTracker.close();
+ configAdminTracker = null;
+ }
}
}
@@ -314,12 +316,10 @@ class OsgiInstallerTestBase implements F
protected ConfigurationAdmin waitForConfigAdmin(final boolean shouldBePresent) {
ConfigurationAdmin result = null;
- if (configAdminTracker == null) {
- synchronized (this) {
- if (configAdminTracker == null) {
- configAdminTracker = new ServiceTracker(bundleContext, ConfigurationAdmin.class.getName(), null);
- configAdminTracker.open();
- }
+ synchronized (this) {
+ if (configAdminTracker == null) {
+ configAdminTracker = new ServiceTracker(bundleContext, ConfigurationAdmin.class.getName(), null);
+ configAdminTracker.open();
}
}