This commit is contained in:
Fabio Sinibaldi 2017-01-26 17:41:23 +00:00
parent 8f36de4a05
commit c92f0c6bd3
1 changed files with 2 additions and 1 deletions

View File

@ -178,7 +178,8 @@ public class DefaultConfiguration implements Configuration {
*/
@Synchronized
protected void loadFromIs() throws MissingServiceEndpointException{
if(!loaded || (!configuration.getAssignedScope().equals(ScopeUtils.getCurrentScopeName()))){
if(!loaded ||
((configuration!=null)&&(!configuration.getAssignedScope().equals(ScopeUtils.getCurrentScopeName())))){ // reuse of configuration in different scopes
log.debug("IS Information not loaded, doing it now..");
AccessPoint point=getIsAccessPoint();
Map<String, Property> properties=point.propertyMap();