jmcnally 02/04/24 22:03:59
Modified: src/java/org/apache/torque Torque.java
Log:
provide a better error message if the pool is not configured for a named
database. patch by Bill Schneider <[EMAIL PROTECTED]> with some
modifications.
Revision Changes Path
1.53 +17 -7 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.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- Torque.java 16 Apr 2002 21:22:49 -0000 1.52
+++ Torque.java 25 Apr 2002 05:03:58 -0000 1.53
@@ -90,7 +90,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Rafal Krzewski</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Martin Poeschl</a>
- * @version $Id: Torque.java,v 1.52 2002/04/16 21:22:49 kschrader Exp $
+ * @version $Id: Torque.java,v 1.53 2002/04/25 05:03:58 jmcnally Exp $
*/
public class Torque implements Initializable, Configurable
{
@@ -1001,13 +1001,23 @@
// If the pool is not in the Hashtable, we must register it.
if ( pool == null )
{
- registerPool(
- name,
- getDatabaseProperty(name, "driver"),
- getDatabaseProperty(name, "url"),
- getDatabaseProperty(name, "username"),
- getDatabaseProperty(name, "password"));
+ // check that pool for this particular db is actually
+ // configured
+ String driver = getDatabaseProperty(name, "driver");
+ String url = getDatabaseProperty(name, "url");
+ String username = getDatabaseProperty(name, "username");
+ String password = getDatabaseProperty(name, "password");
+
+ if (driver == null || url == null
+ || driver.equals("") || url.equals(""))
+ {
+ throw new TorqueException
+ ("Attempt to register pool for database " + name
+ + " that is not configured in Torque.properties");
+ }
+
+ registerPool(name, driver, url, username, password);
pool = (ConnectionPool) pools.get(name);
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
