Author: henning
Date: Sun Sep 17 04:33:41 2006
New Revision: 447049
URL: http://svn.apache.org/viewvc?view=rev&rev=447049
Log:
Fix a NPE when the timestamp column is null.
Modified:
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/resource/loader/DataSourceResourceLoader.java
Modified:
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/resource/loader/DataSourceResourceLoader.java
URL:
http://svn.apache.org/viewvc/jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/resource/loader/DataSourceResourceLoader.java?view=diff&rev=447049&r1=447048&r2=447049
==============================================================================
---
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/resource/loader/DataSourceResourceLoader.java
(original)
+++
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/resource/loader/DataSourceResourceLoader.java
Sun Sep 17 04:33:41 2006
@@ -22,6 +22,7 @@
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
+import java.sql.Timestamp;
import javax.naming.InitialContext;
import javax.naming.NamingException;
@@ -118,6 +119,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">David Kinnvall</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Paulo Gaspar</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Sylwester Lachiewicz</a>
+ * @author <a href="mailto:[EMAIL PROTECTED]">Henning P. Schmiedehausen</a>
* @version $Id$
*/
public class DataSourceResourceLoader extends ResourceLoader
@@ -147,8 +149,9 @@
log.debug("DataSourceResourceLoader : using columns \""
+ keyColumn + "\", \"" + templateColumn + "\" and \""
+ timestampColumn + "\"");
- log.trace("DataSourceResourceLoader initalized.");
}
+
+ log.trace("DataSourceResourceLoader initalized.");
}
else if (dataSourceName != null)
{
@@ -159,8 +162,9 @@
log.debug("DataSourceResourceLoader : using columns \""
+ keyColumn + "\", \"" + templateColumn + "\" and \""
+ timestampColumn + "\"");
- log.trace("DataSourceResourceLoader initalized.");
}
+
+ log.trace("DataSourceResourceLoader initalized.");
}
else
{
@@ -292,7 +296,8 @@
{
if (rs.next())
{
- return rs.getTimestamp(timestampColumn).getTime();
+ Timestamp ts = rs.getTimestamp(timestampColumn);
+ return ts != null ? ts.getTime() : 0;
}
else
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
