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/common/sql QueryTagSupport.java UpdateTagSupport.java
Date Wed, 24 Apr 2002 18:41:26 GMT
luehe       02/04/24 11:41:25

  Modified:    standard/src/org/apache/taglibs/standard/tag/common/sql
                        QueryTagSupport.java UpdateTagSupport.java
  Log:
  Restored resetting of per-invokation state in doFinally()
  
  Revision  Changes    Path
  1.27      +6 -6      jakarta-taglibs/standard/src/org/apache/taglibs/standard/tag/common/sql/QueryTagSupport.java
  
  Index: QueryTagSupport.java
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/standard/src/org/apache/taglibs/standard/tag/common/sql/QueryTagSupport.java,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- QueryTagSupport.java	24 Apr 2002 01:16:31 -0000	1.26
  +++ QueryTagSupport.java	24 Apr 2002 18:41:25 -0000	1.27
  @@ -161,12 +161,6 @@
        */
       public int doStartTag() throws JspException {
   
  -	// Reset the per-invokation state.
  -	parameters = null;
  -	isPartOfTransaction = false;
  -	conn = null;
  -        rawDataSource = null;
  -
           if (!maxRowsSpecified) {
   	    Object obj = Config.find(pageContext, Config.SQL_MAXROWS);
   	    if (obj != null) {
  @@ -272,6 +266,12 @@
   		conn.close();
   	    } catch (SQLException e) {} // Not much we can do
   	}
  +
  +	// Reset the per-invokation state.
  +	parameters = null;
  +	isPartOfTransaction = false;
  +	conn = null;
  +        rawDataSource = null;
       }
   
   
  
  
  
  1.18      +7 -7      jakarta-taglibs/standard/src/org/apache/taglibs/standard/tag/common/sql/UpdateTagSupport.java
  
  Index: UpdateTagSupport.java
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/standard/src/org/apache/taglibs/standard/tag/common/sql/UpdateTagSupport.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- UpdateTagSupport.java	24 Apr 2002 01:16:31 -0000	1.17
  +++ UpdateTagSupport.java	24 Apr 2002 18:41:25 -0000	1.18
  @@ -142,13 +142,6 @@
        */
       public int doStartTag() throws JspException {
   
  -	// Reset the per-invokation state.
  -	parameters = null;
  -	isPartOfTransaction = false;
  -	conn = null;
  -        bodyContent = null;
  -        rawDataSource = null;
  -
   	try {
   	    conn = getConnection();
   	} catch (SQLException e) {
  @@ -219,6 +212,13 @@
   		conn.close();
   	    } catch (SQLException e) {} // Not much we can do
   	}
  +
  +	// Reset the per-invokation state.
  +	parameters = null;
  +	isPartOfTransaction = false;
  +	conn = null;
  +        bodyContent = null;
  +        rawDataSource = null;
       }
   
   
  
  
  

--
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