[cvs] expresso commit by lhamel: protect against NPE

JCorporate Ltd jcorp at jcorporate.com
Fri Dec 17 22:50:41 UTC 2004


Log Message:
-----------
protect against NPE

Modified Files:
--------------
    expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller:
        Controller.java

Revision Data
-------------
Index: Controller.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/Controller.java,v
retrieving revision 1.107
retrieving revision 1.108
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/Controller.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/Controller.java -u -r1.107 -r1.108
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/Controller.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/Controller.java
@@ -1951,7 +1951,12 @@
                  * with all this  *RD* Mon Jul 27 2004 */
 
                 if (mapping.getValidate()) {
-                    actionErrors = (ErrorCollection) form.validate(mapping, request);
+                    if ( form != null ) {
+                        ErrorCollection temp = (ErrorCollection) form.validate(mapping, request);
+                        if ( temp != null ) {
+                            actionErrors = temp;
+                        }
+                    }
                 }
                 /** test if there are no validation errors  *RD* Mon Jul 27 2004 */
                 if (actionErrors.size() == 0) {


More information about the cvs mailing list