Skip to content
Permalink
Browse files
FELIX-6367 add null check (#94)
services returned from the spiTracker may be null
  • Loading branch information
enapps-enorman committed Aug 30, 2021
1 parent b298317 commit 82bc11cc32c21bb42c93b375802f547cefd99472
Showing 1 changed file with 5 additions and 2 deletions.
@@ -438,8 +438,11 @@ private ConfigAdminSupport getConfigurationAdminSupport() {
Object configurationAdmin = getService( CONFIGURATION_ADMIN_NAME );
if ( configurationAdmin != null ) {
final List<ConfigurationHandler> handlers = new ArrayList<>();
for(final Object o : this.spiTracker.getServices()) {
handlers.add((ConfigurationHandler)o);
Object[] services = this.spiTracker.getServices();
if (services != null) {
for(final Object o : services) {
handlers.add((ConfigurationHandler)o);
}
}
return new ConfigAdminSupport( this, configurationAdmin, handlers );
}

0 comments on commit 82bc11c

Please sign in to comment.