You are viewing a plain text version of this content. The canonical link for it is here.
Posted to taglibs-dev@jakarta.apache.org by ho...@apache.org on 2002/04/04 23:49:21 UTC
cvs commit: jakarta-taglibs/standard/src/org/apache/taglibs/standard/tag/common/sql QueryTagSupport.java TransactionTagSupport.java UpdateTagSupport.java
horwat 02/04/04 13:49:21
Modified: standard/src/org/apache/taglibs/standard/tag/common/sql
QueryTagSupport.java TransactionTagSupport.java
UpdateTagSupport.java
Log:
For transparent collaboration use the defined datasource scoped variable.
Bugzilla 6822
Revision Changes Path
1.11 +1 -5 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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- QueryTagSupport.java 30 Mar 2002 21:22:47 -0000 1.10
+++ QueryTagSupport.java 4 Apr 2002 21:49:20 -0000 1.11
@@ -294,11 +294,7 @@
else dataSource = (DataSource) rawDataSource;
}
else {
- ServletContext application = pageContext.getServletContext();
- if (application.getInitParameter(DATASOURCE) != null) {
- dataSource = (DataSource) pageContext.findAttribute(
- application.getInitParameter(DATASOURCE));
- }
+ dataSource = (DataSource) pageContext.findAttribute(DATASOURCE);
}
}
1.4 +1 -3 jakarta-taglibs/standard/src/org/apache/taglibs/standard/tag/common/sql/TransactionTagSupport.java
Index: TransactionTagSupport.java
===================================================================
RCS file: /home/cvs/jakarta-taglibs/standard/src/org/apache/taglibs/standard/tag/common/sql/TransactionTagSupport.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TransactionTagSupport.java 16 Jan 2002 02:22:20 -0000 1.3
+++ TransactionTagSupport.java 4 Apr 2002 21:49:20 -0000 1.4
@@ -232,9 +232,7 @@
}
}
else {
- ServletContext application = pageContext.getServletContext();
- dataSource = (DataSource) pageContext.findAttribute(
- application.getInitParameter(DATASOURCE));
+ dataSource = (DataSource) pageContext.findAttribute(DATASOURCE);
}
}
1.9 +2 -5 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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- UpdateTagSupport.java 30 Mar 2002 21:22:47 -0000 1.8
+++ UpdateTagSupport.java 4 Apr 2002 21:49:20 -0000 1.9
@@ -235,6 +235,7 @@
isPartOfTransaction = false;
conn = null;
dataSource = null;
+ bodyContent = null;
}
//*********************************************************************
@@ -257,11 +258,7 @@
else dataSource = (DataSource) rawDataSource;
}
else {
- ServletContext application = pageContext.getServletContext();
- if (application.getInitParameter(DATASOURCE) != null) {
- dataSource = (DataSource) pageContext.findAttribute(
- application.getInitParameter(DATASOURCE));
- }
+ dataSource = (DataSource) pageContext.findAttribute(DATASOURCE);
}
}
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>