db-torque-user mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "M. Sean Gilligan" <Sean_Gilli...@catalla.com>
Subject Re: Torque using Tomcat
Date Wed, 29 Dec 2004 09:19:57 GMT
>"Wieger Uffink [Us Media]" <wieger@usmedia.nl> writes:
>
>>Ive recompiled torque source with a small patch in the
>>JndiDataSourceFactory and this solves the problem.
>
>Cool. Where is this patch? :-)

I'm not sure if he used the exact same patch as in this message:
http://nagoya.apache.org/eyebrowse/ReadMsg?listName=torque-user@db.apache.org&msgId=1440765

but, I put the patch into my local CVS tree and cleaned up the code formatting/tabs to get
this diff:

$ cvs diff JndiDataSourceFactory.java
Index: JndiDataSourceFactory.java
===================================================================
RCS file: /home/cvspublic/jakarta-turbine-torque/src/java/org/apache/torque/dsfactory/JndiDataSourceFactory.java,v
retrieving revision 1.7
diff -u -r1.7 JndiDataSourceFactory.java
--- JndiDataSourceFactory.java  22 Feb 2004 06:18:52 -0000      1.7
+++ JndiDataSourceFactory.java  29 Dec 2004 09:10:29 -0000
@@ -158,7 +158,7 @@
         Configuration c = configuration.subset("datasource");
         try
         {
-            if (c != null)
+            if (c != null && !c.isEmpty())
             {
                 Object ds = null;
                 Iterator i = c.getKeys();



I plan on trying out a build tomorrow.  My CVS tree has the latest code, but I should probably
build a patched version based on the TORQUE_3_1_1 tag if I want to put this into "production",
right?

Cheers,

Sean



-- 
---------------------------------------------------------------------------
M. Sean Gilligan                    : 831-466-9788 x11
vBlog Central			    : http://www.vblogcentral.com
---------------------------------------------------------------------------

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


Mime
View raw message