db-torque-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tfisc...@apache.org
Subject svn commit: r1103519 - /db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/TorqueInstance.java
Date Sun, 15 May 2011 20:03:59 GMT
Author: tfischer
Date: Sun May 15 20:03:58 2011
New Revision: 1103519

URL: http://svn.apache.org/viewvc?rev=1103519&view=rev
Log:
TORQUE-120: remove inappropriate dependencies on Torque from TorqueInstance.
Thanks to Moriyoshi Koizumi for reporting the bug and creating a patch

Modified:
    db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/TorqueInstance.java

Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/TorqueInstance.java
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/TorqueInstance.java?rev=1103519&r1=1103518&r2=1103519&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/TorqueInstance.java
(original)
+++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/TorqueInstance.java
Sun May 15 20:03:58 2011
@@ -300,7 +300,7 @@ public class TorqueInstance
 
         // check that at least the default database has got an adapter.
         Database defaultDatabase
-                = databases.get(Torque.getDefaultDB());
+                = databases.get(getDefaultDB());
         if (defaultDatabase == null
             || defaultDatabase.getAdapter() == null)
         {
@@ -311,7 +311,7 @@ public class TorqueInstance
                     + "."
                     + Torque.DATABASE_KEY
                     + "."
-                    + Torque.getDefaultDB()
+                    + getDefaultDB()
                     + "."
                     + DB.ADAPTER_KEY;
             log.error(error);
@@ -892,7 +892,7 @@ public class TorqueInstance
     public Connection getConnection(String name)
             throws TorqueException
     {
-        if (!Torque.isInit())
+        if (!isInit())
         {
             throw new TorqueException("Torque is not initialized");
         }
@@ -955,7 +955,7 @@ public class TorqueInstance
             String password)
             throws TorqueException
     {
-        if (!Torque.isInit())
+        if (!isInit())
         {
             throw new TorqueException("Torque is not initialized");
         }



---------------------------------------------------------------------
To unsubscribe, e-mail: torque-dev-unsubscribe@db.apache.org
For additional commands, e-mail: torque-dev-help@db.apache.org


Mime
View raw message