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/08 22:42:58 UTC
cvs commit: jakarta-taglibs/standard/src/org/apache/taglibs/standard/tag/common/sql QueryTagSupport.java UpdateTagSupport.java
horwat 02/04/08 13:42:58
Modified: standard/src/org/apache/taglibs/standard/tag/common/sql
QueryTagSupport.java UpdateTagSupport.java
Log:
Correct syntax checking for nested DataSource exception.
Submitted by Jin Choi
Bugzilla 7218
Revision Changes Path
1.12 +3 -1 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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- QueryTagSupport.java 4 Apr 2002 21:49:20 -0000 1.11
+++ QueryTagSupport.java 8 Apr 2002 20:42:58 -0000 1.12
@@ -305,7 +305,9 @@
TransactionTagSupport parent = (TransactionTagSupport)
findAncestorWithClass(this, TransactionTagSupport.class);
if (parent != null) {
- if (dataSource != null) {
+ ServletContext application = pageContext.getServletContext();
+ if (dataSource != null &&
+ application.getInitParameter(DATASOURCE) == null) {
throw new JspTagException(
Resources.getMessage("ERROR_NESTED_DATASOURCE"));
}
1.10 +3 -1 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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- UpdateTagSupport.java 4 Apr 2002 21:49:20 -0000 1.9
+++ UpdateTagSupport.java 8 Apr 2002 20:42:58 -0000 1.10
@@ -268,7 +268,9 @@
TransactionTagSupport parent = (TransactionTagSupport)
findAncestorWithClass(this, TransactionTagSupport.class);
if (parent != null) {
- if (dataSource != null) {
+ ServletContext application = pageContext.getServletContext();
+ if (dataSource != null &&
+ application.getInitParameter(DATASOURCE) == null) {
throw new JspTagException(
Resources.getMessage("ERROR_NESTED_DATASOURCE"));
}
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>