cvs commit: xml-cocoon2/src/java/org/apache/cocoon/acting AbstractValidatorAction.java

[vgritsenko]

vgritsenko    02/03/27 05:29:29

  Modified:    src/java/org/apache/cocoon/acting
                        AbstractValidatorAction.java
  Log:
  try to fix bug #7478
  
  Revision  Changes    Path
  1.8       +8 -6      
xml-cocoon2/src/java/org/apache/cocoon/acting/AbstractValidatorAction.java
  
  Index: AbstractValidatorAction.java
  ===================================================================
  RCS file: 
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/acting/AbstractValidatorAction.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- AbstractValidatorAction.java      21 Mar 2002 04:09:19 -0000      1.7
  +++ AbstractValidatorAction.java      27 Mar 2002 13:29:29 -0000      1.8
  @@ -146,7 +146,7 @@
   * </table>
   * @author <a href="mailto:[EMAIL PROTECTED]";>Martin Man</a>
   * @author <a href="mailto:[EMAIL PROTECTED]";>Christian Haul</a>
  -* @version CVS $Id: AbstractValidatorAction.java,v 1.7 2002/03/21 04:09:19 
vgritsenko Exp $
  +* @version CVS $Id: AbstractValidatorAction.java,v 1.8 2002/03/27 13:29:29 
vgritsenko Exp $
   */
   public abstract class AbstractValidatorAction
   extends AbstractComplementaryConfigurableAction
  @@ -559,8 +559,9 @@
           try {
               String tmp = cons.getAttribute("nullable");
               return "yes".equals(tmp) || "true".equals(tmp);
  -        } catch (ConfigurationException e) {
  -            String tmp = conf.getAttribute("nullable", "no");
  +        } catch (Exception e) {
  +            String tmp = "no";
  +            if (conf != null) tmp = conf.getAttribute("nullable", "no");
               return "yes".equals(tmp) || "true".equals(tmp);
           }
       }
  @@ -571,11 +572,12 @@
        * default attribute is present in eiher of them.
        */
       private String getDefault(Configuration conf, Configuration cons) {
  -        String dflt = null;
  +        String dflt = "";
           try {
               dflt = cons.getAttribute("default");
  -        } catch (ConfigurationException e) {
  -            dflt = conf.getAttribute("default", "");
  +        } catch (Exception e) {
  +            if (conf != null)
  +                dflt = conf.getAttribute("default", "");
           }
           if ("".equals(dflt.trim())) {
               dflt = null;
  
  
  

----------------------------------------------------------------------
In case of troubles, e-mail:     [EMAIL PROTECTED]
To unsubscribe, e-mail:          [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]