[patch] Patch broken DCL

jspwrapper.dcl.patch (text/plain), 2.39 KB, created by Tim Whittington on 2010-09-30 01:30:16 UTC

(hide)

Description: Patch broken DCL

Filename:

MIME Type:

Creator: Tim Whittington

Created: 2010-09-30 01:30:16 UTC

Size: 2.39 KB

patch

obsolete

>Index: java/org/apache/jasper/servlet/JspServletWrapper.java >=================================================================== >--- java/org/apache/jasper/servlet/JspServletWrapper.java (revision 1002509) >+++ java/org/apache/jasper/servlet/JspServletWrapper.java (working copy) >@@ -79,11 +79,13 @@ > private ServletConfig config; > private Options options; > private boolean firstTime = true; >- private boolean reload = true; >+ /** Whether the servlet needs reloading on next access */ >+ private volatile boolean reload = true; > private boolean isTagFile; > private int tripCount; > private JasperException compileException; >- private long servletClassLastModifiedTime; >+ /** Timestamp of last time servlet resource was modified */ >+ private volatile long servletClassLastModifiedTime; > private long lastModificationTest = 0L; > private Entry<JspServletWrapper> ticket; > >@@ -131,6 +133,9 @@ > } > > public Servlet getServlet() throws ServletException { >+ // DCL on 'reload' requires that 'reload' be volatile >+ // (this also forces a read memory barrier, ensuring the >+ // new servlet object is read consistently) > if (reload) { > synchronized (this) { > // Synchronizing on jsw enables simultaneous loading >@@ -139,7 +144,7 @@ > // This is to maintain the original protocol. > destroy(); > >- Servlet servlet = null; >+ final Servlet servlet; > > try { > InstanceManager instanceManager = InstanceManagerFactory.getInstanceManager(config); >@@ -160,6 +165,7 @@ > > theServlet = servlet; > reload = false; >+ // Volatile 'reload' forces in order write of 'theServlet' and new servlet object > } > } > } >@@ -186,6 +192,9 @@ > * @param lastModified Last-modified time of servlet class > */ > public void setServletClassLastModifiedTime(long lastModified) { >+ // DCL requires servletClassLastModifiedTime be volatile >+ // to force read and write barriers on access/set >+ // (and to get atomic write of long) > if (this.servletClassLastModifiedTime < lastModified) { > synchronized (this) { > if (this.servletClassLastModifiedTime < lastModified) { View Attachment As Diff View Attachment As Raw

This is ASF Bugzilla: the Apache Software Foundation bug tracking system for a variety of projects at the Apache Software Foundation. In case of problems with the functioning of ASF Bugzilla, please contact bugzilla-admin@apache.org. Please Note: this e-mail address is only for reporting problems with ASF Bugzilla. Mail about any other subject will be silently ignored. Not all Apache Software Foundation projects use BugZilla. You may find a more comprehensive list of issue tracking systems at: https://issues.apache.org/.

• • Home
  • | New
  • | Browse
  • | Search
  • |
    [?]
  • | Reports
  • | Help
  • | New Account
  • | Log In
    Remember [x]
  • | Forgot Password
    Login: [x]