Ensure ServletHolder new initialization state is reset after doStop

1 files changed, 4 insertions, 3 deletions

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 5a0c5c8a1f..7c30234bf4 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
@@ -75,7 +75,7 @@ public class ServletHolder extends Holder<Servlet> implements UserIdentity.Scope
     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;
@@ -387,7 +387,7 @@ public class ServletHolder extends Holder<Servlet> implements UserIdentity.Scope
     public void initialize ()
     throws Exception
     {
-        if(!initialized){
+        if(!_initialized){
             super.initialize();
             if (_extInstance || _initOnStartup)
             {
@@ -404,7 +404,7 @@ public class ServletHolder extends Holder<Servlet> implements UserIdentity.Scope
                 }
             }
         }
-        initialized = true;
+        _initialized = true;
     }
     
     
@@ -437,6 +437,7 @@ public class ServletHolder extends Holder<Servlet> implements UserIdentity.Scope
             _servlet=null;
 
         _config=null;
+        _initialized = false;
     }
 
     /* ------------------------------------------------------------ */