aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Becker2011-08-26 13:35:51 (EDT)
committerJesse McConnell2011-09-20 11:11:26 (EDT)
commit95ee2157bddc7fe60a43591a160d49383078d64e (patch)
tree1414ea5f4fad0983f4450fe34aaf7422f507dc57
parent1e30a58419ef1b1f156be6f6d0158e7bd1622149 (diff)
downloadorg.eclipse.jetty.project-95ee2157bddc7fe60a43591a160d49383078d64e.zip
org.eclipse.jetty.project-95ee2157bddc7fe60a43591a160d49383078d64e.tar.gz
org.eclipse.jetty.project-95ee2157bddc7fe60a43591a160d49383078d64e.tar.bz2
JETTY-1414 applied to PropertyUserStore
-rw-r--r--jetty-security/src/main/java/org/eclipse/jetty/security/PropertyUserStore.java8
1 files changed, 5 insertions, 3 deletions
diff --git a/jetty-security/src/main/java/org/eclipse/jetty/security/PropertyUserStore.java b/jetty-security/src/main/java/org/eclipse/jetty/security/PropertyUserStore.java
index 5e46316..7f49893 100644
--- a/jetty-security/src/main/java/org/eclipse/jetty/security/PropertyUserStore.java
+++ b/jetty-security/src/main/java/org/eclipse/jetty/security/PropertyUserStore.java
@@ -201,15 +201,17 @@ public class PropertyUserStore extends AbstractLifeCycle
_scanner.addListener(new BulkListener()
{
- public void filesChanged(List filenames) throws Exception
+ public void filesChanged(List<String> filenames) throws Exception
{
if (filenames == null)
return;
if (filenames.isEmpty())
return;
- if (filenames.size() == 1 && filenames.get(0).equals(getConfigResource().getFile().getAbsolutePath()))
+ if (filenames.size() == 1)
{
- loadUsers();
+ Resource r = Resource.newResource(filenames.get(0));
+ if (r.getFile().equals(_configResource.getFile()))
+ loadUsers();
}
}