kinman 01/12/10 09:48:24
Modified: jasper/src/share/org/apache/jasper/compiler Tag:
tomcat_40_branch 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
No revision
No revision
1.2.2.1 +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.2.2.1
diff -u -r1.2 -r1.2.2.1
--- BeanRepository.java 2001/06/19 04:17:42 1.2
+++ BeanRepository.java 2001/12/10 17:48:24 1.2.2.1
@@ -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.2.2.1 2001/12/10 17:48:24 kinman Exp $
+ * $Revision: 1.2.2.1 $
+ * $Date: 2001/12/10 17:48:24 $
*
* ====================================================================
*
@@ -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: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
