[webconsole] fix rev 903286 (FELIX-2009) which breaks again FELIX-1370 (configuration for org.apache.felix.webconsole.internal.servlet.OsgiManager is sometimes ignored)The test is wrong, as they may be other changes (such as user / password) that may affect the service, so always rebind the main servlet if there is any change
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@919177 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/OsgiManager.java b/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/OsgiManager.java
index 1196773..4891b7e 100644
--- a/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/OsgiManager.java
+++ b/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/OsgiManager.java
@@ -881,28 +881,22 @@
}
// might update http service registration
- if ( !newWebManagerRoot.equals( this.webManagerRoot ) )
+ HttpService httpService = this.httpService;
+ if ( httpService != null )
{
- HttpService httpService = this.httpService;
- if ( httpService != null )
- {
- synchronized ( this )
- {
- // unbind old location first
- unbindHttpService( httpService );
+ // unbind old location first
+ unbindHttpService( httpService );
- // switch location
- this.webManagerRoot = newWebManagerRoot;
+ // switch location
+ this.webManagerRoot = newWebManagerRoot;
- // bind new location now
- bindHttpService( httpService );
- }
- }
- else
- {
- // just set the configured location (FELIX-2034)
- this.webManagerRoot = newWebManagerRoot;
- }
+ // bind new location now
+ bindHttpService( httpService );
+ }
+ else
+ {
+ // just set the configured location (FELIX-2034)
+ this.webManagerRoot = newWebManagerRoot;
}
}