amyroh      2002/12/23 11:34:32

  Modified:    webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources
                        SaveDataSourceAction.java
  Log:
  Port change from tomcat 4.
  
  Revision  Changes    Path
  1.5       +9 -7      
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveDataSourceAction.java
  
  Index: SaveDataSourceAction.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/SaveDataSourceAction.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- SaveDataSourceAction.java 20 Sep 2002 21:22:59 -0000      1.4
  +++ SaveDataSourceAction.java 23 Dec 2002 19:34:32 -0000      1.5
  @@ -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]>

Reply via email to