tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1434661 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/jasper/JspC.java java/org/apache/jasper/servlet/JspCServletContext.java webapps/docs/changelog.xml
Date Thu, 17 Jan 2013 13:21:00 GMT
Author: markt
Date: Thu Jan 17 13:21:00 2013
New Revision: 1434661

URL: http://svn.apache.org/viewvc?rev=1434661&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54440
Fix a regression caused by the changes for https://issues.apache.org/bugzilla/show_bug.cgi?id=54240
that broke compilation with JspC.
Patch provided by Sheldon Shao.

Modified:
    tomcat/tc7.0.x/trunk/   (props changed)
    tomcat/tc7.0.x/trunk/java/org/apache/jasper/JspC.java
    tomcat/tc7.0.x/trunk/java/org/apache/jasper/servlet/JspCServletContext.java
    tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
  Merged /tomcat/trunk:r1434660

Modified: tomcat/tc7.0.x/trunk/java/org/apache/jasper/JspC.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/jasper/JspC.java?rev=1434661&r1=1434660&r2=1434661&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/jasper/JspC.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/jasper/JspC.java Thu Jan 17 13:21:00 2013
@@ -1516,7 +1516,7 @@ public class JspC extends Task implement
         URL urlsA[]=new URL[urls.size()];
         urls.toArray(urlsA);
         loader = new URLClassLoader(urlsA, this.getClass().getClassLoader());
-
+        context.setClassLoader(loader);
     }
 
     /**

Modified: tomcat/tc7.0.x/trunk/java/org/apache/jasper/servlet/JspCServletContext.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/jasper/servlet/JspCServletContext.java?rev=1434661&r1=1434660&r2=1434661&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/jasper/servlet/JspCServletContext.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/jasper/servlet/JspCServletContext.java Thu Jan 17
13:21:00 2013
@@ -78,9 +78,14 @@ public class JspCServletContext implemen
     protected URL myResourceBaseURL;
 
 
-    // ----------------------------------------------------------- Constructors
+    /**
+     * Web application class loader.
+     */
+    private ClassLoader loader;
 
 
+    // ----------------------------------------------------------- Constructors
+
     /**
      * Create a new instance of this ServletContext implementation.
      *
@@ -612,7 +617,12 @@ public class JspCServletContext implemen
 
     @Override
     public ClassLoader getClassLoader() {
-        return null;
+        return loader;
+    }
+
+
+    public void setClassLoader(ClassLoader loader) {
+        this.loader = loader;
     }
 
 

Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1434661&r1=1434660&r2=1434661&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu Jan 17 13:21:00 2013
@@ -67,6 +67,15 @@
       </fix>
     </changelog>
   </subsection>
+  <subsection name="Jasper">
+    <changelog>
+      <fix>
+        <bug>54440</bug>: Correct a regression caused by the changes for
+        <bug>54240</bug> that broke compilation of JSPs with JspC. Patch
+        provided by Sheldon Shao. (markt)
+      </fix>
+    </changelog>
+  </subsection>
 </section>
 <section name="Tomcat 7.0.35 (markt)">
   <subsection name="Catalina">



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message