Repository: karaf Updated Branches: refs/heads/master 870a0ceb0 -> 6af8d60e5
[KARAF-3460] Prevent NPE in AutoEncryptionSupport threading Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/6af8d60e Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/6af8d60e Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/6af8d60e Branch: refs/heads/master Commit: 6af8d60e58f38a55f337d880d953f4e15c47674d Parents: 870a0ce Author: Jean-Baptiste Onofré <[email protected]> Authored: Thu Jan 22 06:46:33 2015 +0100 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Thu Jan 22 06:46:33 2015 +0100 ---------------------------------------------------------------------- .../karaf/jaas/modules/properties/AutoEncryptionSupport.java | 4 ++++ 1 file changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/6af8d60e/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/AutoEncryptionSupport.java ---------------------------------------------------------------------- diff --git a/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/AutoEncryptionSupport.java b/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/AutoEncryptionSupport.java index 08328ce..06714af 100644 --- a/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/AutoEncryptionSupport.java +++ b/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/AutoEncryptionSupport.java @@ -76,6 +76,10 @@ public class AutoEncryptionSupport implements Runnable { public void run() { try { Path dir = Paths.get(System.getProperty("karaf.etc")); + if (watchService == null) { + // just to prevent NPE (KARAF-3460) + watchService = FileSystems.getDefault().newWatchService(); + } dir.register(watchService, ENTRY_MODIFY); Path file = dir.resolve("users.properties");
