commit 65dc76e21f1b5838093b9a7e0a2efd3988aa0a35
author Jan Bartel <janb@webtide.com> Thu Oct 08 10:55:10 2015 +1100
committer Jan Bartel <janb@webtide.com> Thu Oct 08 10:57:26 2015 +1100
tree acd6f3106808dde1cfbe937ac5ea2f1cc1bf3606
parent 35cbe3308bae0be191197beb70dfe8c8b03c7776

Ensure ServletHolder new initialization state is reset after doStop

jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHolder.java

diff --git a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHolder.java b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHolder.java
index 807b331..1ae25d8 100644
--- a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHolder.java
+++ b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHolder.java
@@ -73,7 +73,7 @@
     private static final Logger LOG = Log.getLogger(ServletHolder.class);
     private int _initOrder = -1;
     private boolean _initOnStartup=false;
-    private boolean initialized = false;
+    private boolean _initialized = false;
     private Map<String, String> _roleMap;
     private String _forcedPath;
     private String _runAsRole;
@@ -396,7 +396,7 @@
     public void initialize ()
     throws Exception
     {
-        if(!initialized){
+        if(!_initialized){
             super.initialize();
             if (_extInstance || _initOnStartup)
             {
@@ -413,7 +413,7 @@
                 }
             }
         }
-        initialized = true;
+        _initialized = true;
     }
 
 
@@ -446,6 +446,7 @@
             _servlet=null;
 
         _config=null;
+        _initialized = false;
     }
 
     /* ------------------------------------------------------------ */