remm 01/06/18 21:17:43
Modified: jasper/src/share/org/apache/jasper/compiler
BeanRepository.java
Log:
- Make Jasper dynamically retrieve the classloader instead of sticking with the
same classloader, which was breaking reloading (since Jasper was using the
old classloader, it was never able to pick up changes).
Revision Changes Path
1.2 +9 -9
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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- BeanRepository.java 2000/08/12 00:52:07 1.1
+++ BeanRepository.java 2001/06/19 04:17:42 1.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/BeanRepository.java,v
1.1 2000/08/12 00:52:07 pierred Exp $
- * $Revision: 1.1 $
- * $Date: 2000/08/12 00:52:07 $
+ * $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 $
*
* ====================================================================
*
@@ -84,7 +84,6 @@
Vector appBeans;
Vector requestBeans;
Hashtable beanTypes;
- ClassLoader loader;
public BeanRepository (ClassLoader loader) {
sessionBeans = new Vector(11);
@@ -92,7 +91,6 @@
appBeans = new Vector(11);
requestBeans = new Vector(11);
beanTypes = new Hashtable ();
- this.loader = loader;
}
public boolean checkSessionBean (String s) {
@@ -168,7 +166,8 @@
throws ClassNotFoundException {
Class cls = null;
//try {
- cls = loader.loadClass(clsname) ;
+ cls = Thread.currentThread().getContextClassLoader().loadClass
+ (clsname) ;
//} catch (ClassNotFoundException ex) {
//return false;
//}
@@ -178,7 +177,8 @@
public Class getBeanType (String bean) throws JasperException {
Class cls = null;
try {
- cls = loader.loadClass((String)beanTypes.get(bean)) ;
+ cls = Thread.currentThread().getContextClassLoader().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 = loader.loadClass (clsname);
+ cls = Thread.currentThread().getContextClassLoader().loadClass
(clsname);
}
return cls;
}
@@ -221,7 +221,7 @@
public boolean beanFound (String beanName)
throws ClassNotFoundException {
try {
- Beans.instantiate (loader, beanName);
+ Beans.instantiate(Thread.currentThread().getContextClassLoader(),
beanName);
return true;
} catch (java.io.IOException ex) {
// Ignore it for the time being.
