jakarta-taglibs-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lu...@apache.org
Subject cvs commit: jakarta-taglibs/standard/src/org/apache/taglibs/standard/tag/el/sql QueryTag.java
Date Fri, 26 Apr 2002 22:12:55 GMT
luehe       02/04/26 15:12:54

  Modified:    standard/src/org/apache/taglibs/standard/tag/el/sql
                        QueryTag.java
  Log:
  Do not catch and rethrow any exceptions raised by ExpressionEvaluatorManager.evaluate()
  
  Revision  Changes    Path
  1.7       +13 -18    jakarta-taglibs/standard/src/org/apache/taglibs/standard/tag/el/sql/QueryTag.java
  
  Index: QueryTag.java
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/standard/src/org/apache/taglibs/standard/tag/el/sql/QueryTag.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- QueryTag.java	24 Apr 2002 01:16:31 -0000	1.6
  +++ QueryTag.java	26 Apr 2002 22:12:54 -0000	1.7
  @@ -130,7 +130,7 @@
   
       // Evaluates expressions as necessary
       private void evaluateExpressions() throws JspException {
  -        Object tempInt = null;
  +        Integer tempInt = null;
   
           if (dataSourceEL != null) {
               rawDataSource = (Object) ExpressionEvaluatorManager.evaluate(
  @@ -142,23 +142,18 @@
                   String.class, this, pageContext);
           }
   
  -        try {
  -            if (startRowEL != null) {
  -                tempInt = (Integer) ExpressionEvaluatorManager.evaluate(
  -                    "startRow", startRowEL, Integer.class, this, pageContext);
  -                if (tempInt != null)
  -                    startRow = ((Integer) tempInt).intValue();
  -            }
  +	if (startRowEL != null) {
  +	    tempInt = (Integer) ExpressionEvaluatorManager.evaluate(
  +                "startRow", startRowEL, Integer.class, this, pageContext);
  +	    if (tempInt != null)
  +		startRow = tempInt.intValue();
  +	}
   
  -            if (maxRowsEL != null) {
  -                tempInt = (Integer) ExpressionEvaluatorManager.evaluate(
  -                    "maxRows", maxRowsEL, Integer.class, this, pageContext);
  -                if (tempInt != null)
  -                    maxRows = ((Integer) tempInt).intValue();
  -            }
  -        } catch (Exception ex) {
  -            throw new JspException(Resources.getMessage("PARAM_BAD_VALUE"),
  -				   ex);
  -        }
  +	if (maxRowsEL != null) {
  +	    tempInt = (Integer) ExpressionEvaluatorManager.evaluate(
  +                "maxRows", maxRowsEL, Integer.class, this, pageContext);
  +	    if (tempInt != null)
  +		maxRows = tempInt.intValue();
  +	}
       }
   }
  
  
  

--
To unsubscribe, e-mail:   <mailto:taglibs-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:taglibs-dev-help@jakarta.apache.org>


Mime
View raw message