Skip to content

[KARAF-4784] OsgiConfiguration for JAAS should fallback to default configuration #271

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
shyrkov wants to merge 1 commit into from
Closed

[KARAF-4784] OsgiConfiguration for JAAS should fallback to default configuration #271

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 17 additions & 2 deletions jaas/config/src/main/java/org/apache/karaf/jaas/config/impl/OsgiConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,23 @@

import org.apache.karaf.jaas.config.JaasRealm;
import org.apache.karaf.util.collections.CopyOnWriteArrayIdentityList;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

public class OsgiConfiguration extends Configuration {

private final Logger logger = LoggerFactory.getLogger(OsgiConfiguration.class);

private final List<JaasRealm> realms = new CopyOnWriteArrayIdentityList<JaasRealm>();

private Configuration defaultConfiguration;

public void init() {
try {
defaultConfiguration = Configuration.getConfiguration();
} catch (RuntimeException ex) {
logger.warn("Default configuration for fallback could not be retrieved", ex);
}
Configuration.setConfiguration(this);
}

Expand Down Expand Up @@ -60,11 +71,15 @@ public AppConfigurationEntry[] getAppConfigurationEntry(String name) {
}
if (realm != null) {
return realm.getEntries();
}
} else if (defaultConfiguration != null) {
return defaultConfiguration.getAppConfigurationEntry(name);
}
return null;
}

public void refresh() {
// Nothing to do, as we auto-update the configuration
if (defaultConfiguration != null) {
defaultConfiguration.refresh();
}
}
}