updating jetty to jetty-9.2.16.v2016040

[gigi.git] / lib / jetty / org / eclipse / jetty / security / HashLoginService.java

diff --git a/lib/jetty/org/eclipse/jetty/security/HashLoginService.java b/lib/jetty/org/eclipse/jetty/security/HashLoginService.java
index 335aabd72b86776f822a9a7bc3bdb24d5dfdbdc0..beb051b621a006875ddf64ec8e5439ace776d294 100644 (file)
--- a/lib/jetty/org/eclipse/jetty/security/HashLoginService.java
+++ b/lib/jetty/org/eclipse/jetty/security/HashLoginService.java
@@ -1,6 +1,6 @@
 //
 //  ========================================================================
-//  Copyright (c) 1995-2014 Mort Bay Consulting Pty. Ltd.
+//  Copyright (c) 1995-2016 Mort Bay Consulting Pty. Ltd.
 //  ------------------------------------------------------------------------
 //  All rights reserved. This program and the accompanying materials
 //  are made available under the terms of the Eclipse Public License v1.0
@@ -52,7 +52,6 @@ public class HashLoginService extends MappedLoginService implements UserListener
     private PropertyUserStore _propertyUserStore;
     private String _config;
     private Resource _configResource;
-    private Scanner _scanner;
     private int _refreshInterval = 0;// default is not to reload
 
     /* ------------------------------------------------------------ */
@@ -159,9 +158,9 @@ public class HashLoginService extends MappedLoginService implements UserListener
     protected void doStop() throws Exception
     {
         super.doStop();
-        if (_scanner != null)
-            _scanner.stop();
-        _scanner = null;
+        if (_propertyUserStore != null)
+            _propertyUserStore.stop();
+        _propertyUserStore = null;
     }
     
     /* ------------------------------------------------------------ */