Author: henning
Date: Sat Sep 16 05:21:27 2006
New Revision: 446862
URL: http://svn.apache.org/viewvc?view=rev&rev=446862
Log:
Remove superflous null check. Suggested by FindBugs.
Rethrows RuntimeExceptions. Suggested by FindBugs.
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=446862&r1=446861&r2=446862
==============================================================================
---
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
Sat Sep 16 05:21:27 2006
@@ -249,6 +249,10 @@
closeDbConnection(conn);
}
}
+ catch (RuntimeException e)
+ {
+ throw e;
+ }
// IOException, SQLException
catch(Exception e)
{
@@ -346,10 +350,7 @@
ctx = new InitialContext();
}
- if (dataSource == null)
- {
- dataSource = (DataSource) ctx.lookup(dataSourceName);
- }
+ dataSource = (DataSource) ctx.lookup(dataSourceName);
return dataSource.getConnection();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
