Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Issue #1841 reduce ServletHolder contention

This commit is contained in:
Greg Wilkins 2017-09-23 08:47:45 +10:00
parent 0fa8c565bd
commit 86c6caf608
1 changed files with 26 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHolder.java
View File

@ -81,11 +81,11 @@ public class ServletHolder extends Holder<Servlet> implements UserIdentity.Scope
private ServletRegistration.Dynamic _registration; private ServletRegistration.Dynamic _registration;
private JspContainer _jspContainer; private JspContainer _jspContainer;
private transient Servlet _servlet; private Servlet _servlet;
private transient Config _config; private long _unavailable;
private transient long _unavailable; private Config _config;
private transient boolean _enabled = true; private boolean _enabled = true;
private transient UnavailableException _unavailableEx; private UnavailableException _unavailableEx;
public static final String APACHE_SENTINEL_CLASS = "org.apache.tomcat.InstanceManager"; public static final String APACHE_SENTINEL_CLASS = "org.apache.tomcat.InstanceManager";
@ -528,7 +528,7 @@ public class ServletHolder extends Holder<Servlet> implements UserIdentity.Scope
*/ */
public boolean isAvailable() public boolean isAvailable()
{ {
if (isStarted()&& _unavailable==0) if (isStarted() && _unavailable==0)
return true; return true;
try try
{ {
@ -539,7 +539,7 @@ public class ServletHolder extends Holder<Servlet> implements UserIdentity.Scope
LOG.ignore(e); LOG.ignore(e);
} }
return isStarted()&& _unavailable==0; return isStarted() && _unavailable==0;
} }
/* ------------------------------------------------------------ */ /* ------------------------------------------------------------ */
@ -773,20 +773,30 @@ public class ServletHolder extends Holder<Servlet> implements UserIdentity.Scope
baseRequest.setAttribute(Request.__MULTIPART_CONFIG_ELEMENT, mpce); baseRequest.setAttribute(Request.__MULTIPART_CONFIG_ELEMENT, mpce);
} }
public synchronized Servlet ensureInstance() public Servlet ensureInstance()
throws ServletException, UnavailableException throws ServletException, UnavailableException
{ {
if (_class==null)
throw new UnavailableException("Servlet Not Initialized");
Servlet servlet=_servlet;
if (!isStarted()) if (!isStarted())
throw new UnavailableException("Servlet not initialized", -1); throw new UnavailableException("Servlet not initialized", -1);
if (_unavailable!=0 || (!_initOnStartup && servlet==null))
servlet=getServlet();
if (servlet==null)
throw new UnavailableException("Could not instantiate "+_class);
return servlet; Servlet servlet=_servlet;
if (servlet!=null && _unavailable==0)
return servlet;
synchronized(this)
{
servlet=_servlet;
if (servlet!=null)
return servlet;
if (_class == null)
throw new UnavailableException("Servlet Not Initialized");
if (_unavailable != 0 || (!_initOnStartup && servlet == null))
servlet = getServlet();
if (servlet == null)
throw new UnavailableException("Could not instantiate " + _class);
return servlet;
}
} }
/* ------------------------------------------------------------ */ /* ------------------------------------------------------------ */