Return-Path: Delivered-To: apmail-jakarta-taglibs-dev-archive@apache.org Received: (qmail 75553 invoked from network); 19 Apr 2002 02:25:37 -0000 Received: from unknown (HELO nagoya.betaversion.org) (192.18.49.131) by daedalus.apache.org with SMTP; 19 Apr 2002 02:25:37 -0000 Received: (qmail 6643 invoked by uid 97); 19 Apr 2002 02:25:43 -0000 Delivered-To: qmlist-jakarta-archive-taglibs-dev@jakarta.apache.org Received: (qmail 6627 invoked by uid 97); 19 Apr 2002 02:25:43 -0000 Mailing-List: contact taglibs-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Tag Libraries Developers List" Reply-To: "Tag Libraries Developers List" Delivered-To: mailing list taglibs-dev@jakarta.apache.org Received: (qmail 6612 invoked by uid 97); 19 Apr 2002 02:25:42 -0000 Date: 19 Apr 2002 02:25:32 -0000 Message-ID: <20020419022532.78416.qmail@icarus.apache.org> From: shawn@apache.org To: jakarta-taglibs-cvs@apache.org Subject: cvs commit: jakarta-taglibs/standard/src/org/apache/taglibs/standard/tag/common/sql DataSourceUtil.java X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N shawn 02/04/18 19:25:32 Modified: standard/src/org/apache/taglibs/standard/tag/common/sql DataSourceUtil.java Log: Error handling AND correct behavior, both at once. Wow. Revision Changes Path 1.5 +6 -3 jakarta-taglibs/standard/src/org/apache/taglibs/standard/tag/common/sql/DataSourceUtil.java Index: DataSourceUtil.java =================================================================== RCS file: /home/cvs/jakarta-taglibs/standard/src/org/apache/taglibs/standard/tag/common/sql/DataSourceUtil.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- DataSourceUtil.java 19 Apr 2002 02:04:03 -0000 1.4 +++ DataSourceUtil.java 19 Apr 2002 02:25:32 -0000 1.5 @@ -106,8 +106,8 @@ if (rawDataSource == null) { rawDataSource = Config.find(pageContext, Config.SQL_DATASOURCE); hasDataSourceAttribute = false; - } - else { + return; + } else { hasDataSourceAttribute = true; } @@ -125,7 +125,10 @@ } } else if (rawDataSource instanceof DataSource) { dataSource = (DataSource) rawDataSource; - } + } else { + throw new JspException( + Resources.getMessage("SQL_DATASOURCE_INVALID")); + } } /** -- To unsubscribe, e-mail: For additional commands, e-mail: