cvs commit: jakarta-turbine-torque/src/java/org/apache/torque Torque.java

[dlr]

dlr         01/08/20 18:12:23

  Modified:    src/java/org/apache/torque Torque.java
  Log:
  Make methods NPE-safe.
  
  Revision  Changes    Path
  1.9       +3 -4      jakarta-turbine-torque/src/java/org/apache/torque/Torque.java
  
  Index: Torque.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-torque/src/java/org/apache/torque/Torque.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -u -r1.8 -r1.9
  --- Torque.java       2001/08/20 21:07:50     1.8
  +++ Torque.java       2001/08/21 01:12:23     1.9
  @@ -78,7 +78,7 @@
    * @author <a href="mailto:[EMAIL PROTECTED]";>Magn�s ��r Torfason</a>
    * @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
    * @author <a href="mailto:[EMAIL PROTECTED]";>Rafal Krzewski</a>
  - * @version $Id: Torque.java,v 1.8 2001/08/20 21:07:50 jon Exp $
  + * @version $Id: Torque.java,v 1.9 2001/08/21 01:12:23 dlr Exp $
    */
   public class Torque
   {
  @@ -215,8 +215,7 @@
       public static DatabaseMap getDatabaseMap()
           throws TorqueException
       {
  -        return getDatabaseMap(
  -            configuration.getString(DATABASE_DEFAULT, DEFAULT_NAME));
  +        return getDatabaseMap(getDefaultMap());
       }
   
       /**
  @@ -522,7 +521,7 @@
       public static DB getDB()
           throws Exception
       {
  -        return getDB(configuration.getString(DATABASE_DEFAULT, DEFAULT_NAME));
  +        return getDB(getDefaultDB());
       }
   
       /**
  
  
  

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