You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by jo...@apache.org on 2001/08/02 08:56:49 UTC
cvs commit: jakarta-turbine-torque/src/java/org/apache/torque Torque.java
jon 01/08/01 23:56:49
Modified: src/java/org/apache/torque Torque.java
Log:
another case where static methods are relying on objects which may not
already exist because of weird initialization ordering foo or something.
i can see that this is going to be a problem all over the code. so far, i
can't make scarab work because of this.
i really don't see how you have things working jason...
-jon
Revision Changes Path
1.2 +9 -1 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Torque.java 2001/08/02 05:08:16 1.1
+++ Torque.java 2001/08/02 06:56:49 1.2
@@ -78,7 +78,7 @@
* @author <a href="mailto:magnus@handtolvur.is">Magn�s ��r Torfason</a>
* @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
* @author <a href="mailto:Rafal.Krzewski@e-point.pl">Rafal Krzewski</a>
- * @version $Id: Torque.java,v 1.1 2001/08/02 05:08:16 jvanzyl Exp $
+ * @version $Id: Torque.java,v 1.2 2001/08/02 06:56:49 jon Exp $
*/
public class Torque
{
@@ -624,11 +624,19 @@
public static String getDefaultDB()
{
+ if (configuration == null)
+ {
+ return "default";
+ }
return configuration.getString(DATABASE_DEFAULT,"default");
}
public static String getDefaultMap()
{
+ if (configuration == null)
+ {
+ return "default";
+ }
return configuration.getString(DATABASE_DEFAULT,"default");
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org