jmcnally 02/05/23 11:25:53
Modified: src/java/org/apache/torque Torque.java
Log:
avoid npe if datasources are not defined.
Revision Changes Path
1.59 +4 -2 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.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- Torque.java 21 May 2002 19:51:44 -0000 1.58
+++ Torque.java 23 May 2002 18:25:53 -0000 1.59
@@ -103,7 +103,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.58 2002/05/21 19:51:44 jmcnally Exp $
+ * @version $Id: Torque.java,v 1.59 2002/05/23 18:25:53 jmcnally Exp $
*/
public class Torque implements Initializable, Configurable
{
@@ -378,6 +378,8 @@
try
{
Class mapClass = Class.forName("java.util.Map");
+ if (c != null)
+ {
Iterator i = c.getKeys();
while (i.hasNext())
{
@@ -421,6 +423,7 @@
bindDStoJndi(ctx, path, ds);
}
}
+ }
}
}
catch (Exception e)
@@ -1031,7 +1034,6 @@
}
catch (Exception e)
{
- e.printStackTrace();
throw new TorqueException(e);
}
return con;
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
