Author: markt
Date: Thu Jan 17 13:17:42 2013
New Revision: 1434660
URL: http://svn.apache.org/viewvc?rev=1434660&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
Modified:
tomcat/trunk/java/org/apache/jasper/JspC.java
tomcat/trunk/java/org/apache/jasper/servlet/JspCServletContext.java
Modified: tomcat/trunk/java/org/apache/jasper/JspC.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/JspC.java?rev=1434660&r1=1434659&r2=1434660&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/JspC.java (original)
+++ tomcat/trunk/java/org/apache/jasper/JspC.java Thu Jan 17 13:17:42 2013
@@ -1513,7 +1513,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/trunk/java/org/apache/jasper/servlet/JspCServletContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/servlet/JspCServletContext.java?rev=1434660&r1=1434659&r2=1434660&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/servlet/JspCServletContext.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/servlet/JspCServletContext.java Thu Jan
17 13:17:42 2013
@@ -78,9 +78,14 @@ public class JspCServletContext implemen
protected final 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;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
