amyroh 2002/12/23 11:17:19
Modified: webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources
SaveDataSourceAction.java
Log:
Add a check for empty validation query before setting it.
Revision Changes Path
1.10 +9 -7
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveDataSourceAction.java
Index: SaveDataSourceAction.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveDataSourceAction.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- SaveDataSourceAction.java 19 Sep 2002 22:56:05 -0000 1.9
+++ SaveDataSourceAction.java 23 Dec 2002 19:17:19 -0000 1.10
@@ -265,9 +265,11 @@
(oname,
new Attribute(attribute, dataSourceForm.getWait()));
attribute = "validationQuery";
- mserver.setAttribute
- (oname,
- new Attribute(attribute, dataSourceForm.getQuery()));
+ String validationQuery = dataSourceForm.getQuery();
+ if ((validationQuery != null) && (validationQuery.length()>0)) {
+ mserver.setAttribute(oname,
+ new Attribute(attribute, validationQuery));
+ }
} catch (Exception e) {
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
