You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2012/11/26 15:31:32 UTC

svn commit: r1413645 - /sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/jasper/servlet/JspServletWrapper.java

Author: cziegeler
Date: Mon Nov 26 14:31:32 2012
New Revision: 1413645

URL: http://svn.apache.org/viewvc?rev=1413645&view=rev
Log:
SLING-2678 : Parallel compilation if same jsp is requested in parallel

Modified:
    sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/jasper/servlet/JspServletWrapper.java

Modified: sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/jasper/servlet/JspServletWrapper.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/jasper/servlet/JspServletWrapper.java?rev=1413645&r1=1413644&r2=1413645&view=diff
==============================================================================
--- sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/jasper/servlet/JspServletWrapper.java (original)
+++ sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/jasper/servlet/JspServletWrapper.java Mon Nov 26 14:31:32 2012
@@ -150,7 +150,7 @@ public class JspServletWrapper {
                 return ((DynamicClassLoader)theServlet.getClass().getClassLoader()).isLive();
             }
         }
-        return false;
+        return true;
     }
 
     @SuppressWarnings("unchecked")
@@ -479,6 +479,9 @@ public class JspServletWrapper {
             }
             if ( theServlet == null ) {
                 synchronized ( this ) {
+                    if ( compileException != null ) {
+                        throw compileException;
+                    }
                     if ( theServlet == null ) {
                         this.prepareServlet(request, response);
                     }