orlikowski 2004/06/14 12:29:21
Modified: src/org/apache/bsf BSFManager.java
Log:
A fix for the inability to register a null bean.
PR: 20355
Submitted by: [EMAIL PROTECTED]
Reviewed by: Victor J. Orlikowski <[EMAIL PROTECTED]>
Revision Changes Path
1.7 +9 -1 jakarta-bsf/src/org/apache/bsf/BSFManager.java
Index: BSFManager.java
===================================================================
RCS file: /home/cvs/jakarta-bsf/src/org/apache/bsf/BSFManager.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- BSFManager.java 14 Jun 2004 19:19:32 -0000 1.6
+++ BSFManager.java 14 Jun 2004 19:29:21 -0000 1.7
@@ -686,7 +686,7 @@
*/
public Object lookupBean(String beanName) {
try {
- return objectRegistry.lookup(beanName);
+ return ((BSFDeclaredBean)objectRegistry.lookup(beanName)).bean;
}
catch (IllegalArgumentException e) {
return null;
@@ -701,6 +701,14 @@
* @param bean the bean to register
*/
public void registerBean(String beanName, Object bean) {
+ BSFDeclaredBean tempBean;
+
+ if(bean == null) {
+ tempBean = new BSFDeclaredBean(beanName, null, null);
+ }
+ else {
+ tempBean = new BSFDeclaredBean(beanName, bean, bean.getClass());
+ }
objectRegistry.register(beanName, bean);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
