***************
*** 271,277 ****
  	TransactionTagSupport parent = (TransactionTagSupport) 
  	    findAncestorWithClass(this, TransactionTagSupport.class);
  	if (parent != null) {
!             if (dataSource != null) {
                  throw new JspTagException(
                      Resources.getMessage("ERROR_NESTED_DATASOURCE"));
              }
--- 271,278 ----
  	TransactionTagSupport parent = (TransactionTagSupport) 
  	    findAncestorWithClass(this, TransactionTagSupport.class);
  	if (parent != null) {
!             ServletContext application = pageContext.getServletContext();
!             if (dataSource != null && application.getInitParameter(DATASOURCE) == null) {
                  throw new JspTagException(
                      Resources.getMessage("ERROR_NESTED_DATASOURCE"));
              }