Repository: karaf Updated Branches: refs/heads/karaf-2.x 898bcb9c7 -> a3b899d68
fix test failure Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/a3b899d6 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/a3b899d6 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/a3b899d6 Branch: refs/heads/karaf-2.x Commit: a3b899d68b4e77663431f6bb5bda5f50f55606d2 Parents: 898bcb9 Author: Freeman Fang <[email protected]> Authored: Thu Apr 24 12:43:26 2014 +0800 Committer: Freeman Fang <[email protected]> Committed: Thu Apr 24 12:43:26 2014 +0800 ---------------------------------------------------------------------- .../karaf/jaas/modules/properties/PropertiesLoginModule.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/a3b899d6/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesLoginModule.java ---------------------------------------------------------------------- diff --git a/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesLoginModule.java b/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesLoginModule.java index 8afe51e..0bc983a 100644 --- a/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesLoginModule.java +++ b/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/properties/PropertiesLoginModule.java @@ -60,7 +60,7 @@ public class PropertiesLoginModule extends AbstractKarafLoginModule { LOGGER.debug("Initialized debug={} usersFile={}", debug, usersFile); } - if (propertiesInstaller == null || !usersFile.equals(propertiesInstaller.getUsersFileName()) ) { + if (propertiesInstaller == null || (usersFile != null && !usersFile.equals(propertiesInstaller.getUsersFileName()))) { LOGGER.debug("Register PropertiesInstaller service");
