cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tcu...@apache.org
Subject cvs commit: cocoon-2.1/src/blocks/databases/java/org/apache/cocoon/components/language/markup/xsp/java esql.xsl
Date Mon, 06 Oct 2003 15:36:08 GMT
tcurdt      2003/10/06 08:36:08

  Modified:    src/blocks/databases/java/org/apache/cocoon/components/language/markup/xsp
                        AbstractEsqlQuery.java
               src/blocks/databases/java/org/apache/cocoon/components/language/markup/xsp/java
                        esql.xsl
  Log:
  Fixed bug #19702 reported by Liaw Wei Tjong <weitjong at magix.com.sg>
  
  Revision  Changes    Path
  1.7       +2 -1      cocoon-2.1/src/blocks/databases/java/org/apache/cocoon/components/language/markup/xsp/AbstractEsqlQuery.java
  
  Index: AbstractEsqlQuery.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/databases/java/org/apache/cocoon/components/language/markup/xsp/AbstractEsqlQuery.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- AbstractEsqlQuery.java	18 Aug 2003 09:42:29 -0000	1.6
  +++ AbstractEsqlQuery.java	6 Oct 2003 15:36:08 -0000	1.7
  @@ -359,6 +359,7 @@
               if (resultSet != null) {
                   resultSetMetaData = resultSet.getMetaData();
                   queryResultsCount++;
  +                hasResultSet = true;
                   return (true);
               }
               else {
  
  
  
  1.7       +3 -3      cocoon-2.1/src/blocks/databases/java/org/apache/cocoon/components/language/markup/xsp/java/esql.xsl
  
  Index: esql.xsl
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/databases/java/org/apache/cocoon/components/language/markup/xsp/java/esql.xsl,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- esql.xsl	8 Sep 2003 14:26:50 -0000	1.6
  +++ esql.xsl	6 Oct 2003 15:36:08 -0000	1.7
  @@ -503,7 +503,7 @@
               <xsl:call-template name="set-call-parameter"/>
             </xsl:for-each>
             <xsl:choose>
  -            <xsl:when test="esql:call[@needs-query='true' or @needs-query='yes']">_esql_query.execute(true);</xsl:when>
  +            <xsl:when test="esql:call[@needs-query='true' or @needs-query='yes']">_esql_query.executeQuery();</xsl:when>
               <xsl:when test="esql:call[@resultset-from-object]">_esql_query.execute(<xsl:apply-templates
select="esql:call" mode="resultset"/>);</xsl:when>
               <xsl:otherwise>_esql_query.execute();</xsl:otherwise>
             </xsl:choose>
  
  
  

Mime
View raw message