dgraham     2002/11/20 18:02:16

  Modified:    src/share/org/apache/struts/taglib/html
                        JavascriptValidatorTag.java
  Log:
  Throw a nicer NPE for Bugzilla PR# 14720.
  
  Revision  Changes    Path
  1.18      +11 -2     
jakarta-struts/src/share/org/apache/struts/taglib/html/JavascriptValidatorTag.java
  
  Index: JavascriptValidatorTag.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/JavascriptValidatorTag.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- JavascriptValidatorTag.java       20 Nov 2002 05:56:08 -0000      1.17
  +++ JavascriptValidatorTag.java       21 Nov 2002 02:02:16 -0000      1.18
  @@ -333,8 +333,17 @@
   
                   // Create list of ValidatorActions based on lActionMethods
                   for (Iterator i = lActionMethods.iterator(); i.hasNext();) {
  -                    ValidatorAction va = resources.getValidatorAction((String) 
i.next());
  +                    String depends = (String) i.next();
  +                    ValidatorAction va = resources.getValidatorAction(depends);
   
  +                    // throw nicer NPE for easier debugging
  +                    if (va == null) {
  +                        throw new NullPointerException(
  +                            "Depends string \""
  +                                + depends
  +                                + "\" was not found in validator-rules.xml.");
  +                    }               
  +                    
                       String javascript = va.getJavascript();
                       if (javascript != null && javascript.length() > 0) {
                           lActions.add(va);
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

Reply via email to