cvs commit: db-torque/src/java/org/apache/torque/util Criteria.java

[dlr]

dlr         2003/02/27 09:37:43

  Modified:    src/java/org/apache/torque Torque.java
               src/java/org/apache/torque/util Criteria.java
  Log:
  Integrated some suggestions by J�rgen Hoffmann <[EMAIL PROTECTED]>:
  
  * src/java/org/apache/torque/Torque.java
    getDefaultDB(): Trimmed value read from configuration.
  
  * src/java/org/apache/torque/util/Criteria.java
    setDbName(String): If parameter is not null, trim it.
  
  Revision  Changes    Path
  1.79      +2 -2      db-torque/src/java/org/apache/torque/Torque.java
  
  Index: Torque.java
  ===================================================================
  RCS file: /home/cvs/db-torque/src/java/org/apache/torque/Torque.java,v
  retrieving revision 1.78
  retrieving revision 1.79
  diff -u -u -r1.78 -r1.79
  --- Torque.java       25 Jan 2003 16:24:36 -0000      1.78
  +++ Torque.java       27 Feb 2003 17:37:42 -0000      1.79
  @@ -970,7 +970,7 @@
           {
               // Determine default database name.
               defaultDBName =
  -                configuration.getString(DATABASE_DEFAULT, DEFAULT_NAME);
  +                configuration.getString(DATABASE_DEFAULT, DEFAULT_NAME).trim();
           }
   
           return defaultDBName;
  
  
  
  1.39      +2 -2      db-torque/src/java/org/apache/torque/util/Criteria.java
  
  Index: Criteria.java
  ===================================================================
  RCS file: /home/cvs/db-torque/src/java/org/apache/torque/util/Criteria.java,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -u -r1.38 -r1.39
  --- Criteria.java     22 Jan 2003 21:44:02 -0000      1.38
  +++ Criteria.java     27 Feb 2003 17:37:42 -0000      1.39
  @@ -554,7 +554,7 @@
        */
       public void setDbName(String dbName)
       {
  -        this.dbName = (dbName == null ? Torque.getDefaultDB() : dbName);
  +        this.dbName = (dbName == null ? Torque.getDefaultDB() : dbName.trim());
       }
   
       /**
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]