Skip to content
Merged
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,8 @@ final class FileWatchingX509ExtendedKeyManager extends X509ExtendedKeyManager {
this.keyManagerFactory = keyManagerFactory;

new FileWatcher(this.certificates, new FileWatcherCallback()).watch();
new FileWatcher(this.privateKey, new FileWatcherCallback()).watch();
// disable watching the key file to prevent race condition bug - a certificate file change covers the key change
// new FileWatcher(this.privateKey, new FileWatcherCallback()).watch();

if (this.keyManager.compareAndSet(null, getKeyManager(getKeyStore()))) {
this.logger.info(String.format("Initialized KeyManager for %s and %s", this.privateKey, this.certificates));
Expand Down