You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ki...@apache.org on 2001/12/10 18:43:16 UTC
cvs commit: jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler BeanRepository.java
kinman 01/12/10 09:43:16
Modified: jasper/src/share/org/apache/jasper CommandLineContext.java
JspCompilationContext.java
jasper/src/share/org/apache/jasper/compiler
BeanRepository.java
Log:
PR: 4705 and 4949
- Use the correct class loader when loading a bean. This fixed a problem
in jspc when processing jsp:setProperty.
Revision Changes Path
1.7 +4 -4 jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/CommandLineContext.java
Index: CommandLineContext.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/CommandLineContext.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- CommandLineContext.java 2001/02/08 13:36:56 1.6
+++ CommandLineContext.java 2001/12/10 17:43:16 1.7
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/CommandLineContext.java,v 1.6 2001/02/08 13:36:56 glenn Exp $
- * $Revision: 1.6 $
- * $Date: 2001/02/08 13:36:56 $
+ * $Header: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/CommandLineContext.java,v 1.7 2001/12/10 17:43:16 kinman Exp $
+ * $Revision: 1.7 $
+ * $Date: 2001/12/10 17:43:16 $
*
* ====================================================================
*
@@ -164,7 +164,7 @@
/**
* What class loader to use for loading classes while compiling
- * this JSP? I don't think this is used right now -- akv.
+ * this JSP?
*/
public ClassLoader getClassLoader() {
return loader;
1.6 +4 -4 jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/JspCompilationContext.java
Index: JspCompilationContext.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/JspCompilationContext.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- JspCompilationContext.java 2001/02/08 13:37:16 1.5
+++ JspCompilationContext.java 2001/12/10 17:43:16 1.6
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/JspCompilationContext.java,v 1.5 2001/02/08 13:37:16 glenn Exp $
- * $Revision: 1.5 $
- * $Date: 2001/02/08 13:37:16 $
+ * $Header: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/JspCompilationContext.java,v 1.6 2001/12/10 17:43:16 kinman Exp $
+ * $Revision: 1.6 $
+ * $Date: 2001/12/10 17:43:16 $
*
* ====================================================================
*
@@ -101,7 +101,7 @@
/**
* What class loader to use for loading classes while compiling
- * this JSP? I don't think this is used right now -- akv.
+ * this JSP?
*/
public ClassLoader getClassLoader();
1.3 +8 -8 jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/BeanRepository.java
Index: BeanRepository.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/BeanRepository.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- BeanRepository.java 2001/06/19 04:17:42 1.2
+++ BeanRepository.java 2001/12/10 17:43:16 1.3
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/BeanRepository.java,v 1.2 2001/06/19 04:17:42 remm Exp $
- * $Revision: 1.2 $
- * $Date: 2001/06/19 04:17:42 $
+ * $Header: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/BeanRepository.java,v 1.3 2001/12/10 17:43:16 kinman Exp $
+ * $Revision: 1.3 $
+ * $Date: 2001/12/10 17:43:16 $
*
* ====================================================================
*
@@ -84,6 +84,7 @@
Vector appBeans;
Vector requestBeans;
Hashtable beanTypes;
+ ClassLoader loader;
public BeanRepository (ClassLoader loader) {
sessionBeans = new Vector(11);
@@ -91,6 +92,7 @@
appBeans = new Vector(11);
requestBeans = new Vector(11);
beanTypes = new Hashtable ();
+ this.loader = loader;
}
public boolean checkSessionBean (String s) {
@@ -166,8 +168,7 @@
throws ClassNotFoundException {
Class cls = null;
//try {
- cls = Thread.currentThread().getContextClassLoader().loadClass
- (clsname) ;
+ cls = loader.loadClass (clsname);
//} catch (ClassNotFoundException ex) {
//return false;
//}
@@ -177,8 +178,7 @@
public Class getBeanType (String bean) throws JasperException {
Class cls = null;
try {
- cls = Thread.currentThread().getContextClassLoader().loadClass
- ((String)beanTypes.get(bean)) ;
+ cls = loader.loadClass ((String)beanTypes.get(bean));
} catch (ClassNotFoundException ex) {
throw new JasperException (ex);
}
@@ -213,7 +213,7 @@
throws ClassNotFoundException {
Class cls = null;
if (clsname != null) {
- cls = Thread.currentThread().getContextClassLoader().loadClass (clsname);
+ cls = loader.loadClass (clsname);
}
return cls;
}
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>