You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by ma...@apache.org on 2009/03/15 23:32:18 UTC
svn commit: r754780 -
/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/PoolingDriver.java
Author: markt
Date: Sun Mar 15 22:32:18 2009
New Revision: 754780
URL: http://svn.apache.org/viewvc?rev=754780&view=rev
Log:
Fix DBCP-145.
Fall back to ContextClassLoader for obtaining .jocl file
Patch provided by Jörg von Frantzius
Modified:
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/PoolingDriver.java
Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/PoolingDriver.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/PoolingDriver.java?rev=754780&r1=754779&r2=754780&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/PoolingDriver.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/PoolingDriver.java Sun Mar 15 22:32:18 2009
@@ -106,6 +106,10 @@
ObjectPool pool = (ObjectPool)(_pools.get(name));
if(null == pool) {
InputStream in = this.getClass().getResourceAsStream(String.valueOf(name) + ".jocl");
+ if (in == null) {
+ in = Thread.currentThread().getContextClassLoader(
+ ).getResourceAsStream(String.valueOf(name) + ".jocl");
+ }
if(null != in) {
JOCLContentHandler jocl = null;
try {