craigmcc 2002/12/15 19:48:27
Modified: src/share/org/apache/struts/action DynaActionFormClass.java
Log:
Make the TestDynaActionFormClass tests work again, even when there is no
ModuleConfig associated with a FormBeanConfig.
Revision Changes Path
1.12 +10 -6
jakarta-struts/src/share/org/apache/struts/action/DynaActionFormClass.java
Index: DynaActionFormClass.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/action/DynaActionFormClass.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- DynaActionFormClass.java 8 Dec 2002 02:09:44 -0000 1.11
+++ DynaActionFormClass.java 16 Dec 2002 03:48:27 -0000 1.12
@@ -71,6 +71,7 @@
import org.apache.commons.beanutils.DynaProperty;
import org.apache.struts.config.FormBeanConfig;
import org.apache.struts.config.FormPropertyConfig;
+import org.apache.struts.config.ModuleConfig;
import org.apache.struts.util.RequestUtils;
@@ -308,8 +309,11 @@
if (dynaClasses == null) {
dynaClasses = new HashMap();
}
- String key =
- config.getName() + config.getModuleConfig().getPrefix();
+ ModuleConfig moduleConfig = config.getModuleConfig();
+ String key = config.getName();
+ if (moduleConfig != null) {
+ key += moduleConfig.getPrefix();
+ }
DynaActionFormClass dynaClass =
(DynaActionFormClass) dynaClasses.get(key);
if (dynaClass == null) {
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
