Skip to content

[KARAF-4423] Jaas AutoEncryption support can correctly shutdown and i… #164

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
CodingFabian wants to merge 1 commit into from
Closed

[KARAF-4423] Jaas AutoEncryption support can correctly shutdown and i… #164

Show file tree
Hide file tree
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
16 changes: 11 additions & 5 deletions jaas/modules/src/main/java/org/apache/karaf/jaas/modules/impl/Activator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,13 +71,16 @@ protected void doOpen() throws Exception {

karafRealm = new KarafRealm(bundleContext, config);
register(JaasRealm.class, karafRealm);

autoEncryptionSupport = new AutoEncryptionSupport(config);
if (Boolean.parseBoolean((String) config.get(ENCRYPTION_ENABLED))) {
autoEncryptionSupport = new AutoEncryptionSupport(config);
}
}

@Override
protected void doStop() {
StreamUtils.close(autoEncryptionSupport);
if (autoEncryptionSupport != null) {
autoEncryptionSupport.close();
}
super.doStop();
LDAPCache.clear();
}
Expand All @@ -89,9 +92,12 @@ protected void reconfigure() {
karafRealm.updated(config);
}
if (autoEncryptionSupport != null) {
StreamUtils.close(autoEncryptionSupport);
autoEncryptionSupport.close();
autoEncryptionSupport = null;
}
if (Boolean.parseBoolean((String) config.get(ENCRYPTION_ENABLED))) {
autoEncryptionSupport = new AutoEncryptionSupport(config);
}
autoEncryptionSupport = new AutoEncryptionSupport(config);
}

private Map<String, Object> getConfig() {
Expand Down
6 changes: 3 additions & 3 deletions ...modules/src/main/java/org/apache/karaf/jaas/modules/properties/AutoEncryptionSupport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,13 @@
public class AutoEncryptionSupport implements Runnable, Closeable {

private final Logger LOGGER = LoggerFactory.getLogger(AutoEncryptionSupport.class);
boolean running;
private volatile EncryptionSupport encryptionSupport;
private volatile boolean running;
private EncryptionSupport encryptionSupport;
private ExecutorService executor;

public AutoEncryptionSupport(Map<String, Object> properties) {
running = true;
this.encryptionSupport = new EncryptionSupport(properties);
encryptionSupport = new EncryptionSupport(properties);
executor = Executors.newSingleThreadExecutor();
executor.execute(this);
}
Expand Down