svn commit: r1626987 - in /commons/proper/dbcp/trunk/src: changes/changes.xml main/java/org/apache/commons/dbcp2/BasicDataSource.java

[ma...@apache.org]

Author: markt
Date: Tue Sep 23 12:40:37 2014
New Revision: 1626987

URL: http://svn.apache.org/r1626987
Log:
Do not ignore the configured custom eviction policy when creating a BasicDataSource.

Modified:
    commons/proper/dbcp/trunk/src/changes/changes.xml
    commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java

Modified: commons/proper/dbcp/trunk/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/changes/changes.xml?rev=1626987&r1=1626986&r2=1626987&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/changes/changes.xml (original)
+++ commons/proper/dbcp/trunk/src/changes/changes.xml Tue Sep 23 12:40:37 2014
@@ -72,6 +72,10 @@ The <action> type attribute can be add,u
         Correct some Javadoc references to Apache Commons Pool 2 classes that
         have changed names since Pool 1.x. 
       </action>
+      <action dev="markt" type="fix">
+        Do not ignore the configured custom eviction policy when creating a
+        BasicDataSource.
+      </action>
     </release>
     <release version="2.0.1" date="24 May 2014" description="This is a bug fix release.">
       <action dev="markt" type="fix">

Modified: commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java?rev=1626987&r1=1626986&r2=1626987&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java (original)
+++ commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java Tue Sep 23 12:40:37 2014
@@ -2079,6 +2079,7 @@ public class BasicDataSource implements 
         gop.setTestWhileIdle(testWhileIdle);
         gop.setLifo(lifo);
         gop.setSwallowedExceptionListener(new SwallowedExceptionLogger(log));
+        gop.setEvictionPolicyClassName(evictionPolicyClassName);
         factory.setPool(gop);
         connectionPool = gop;
     }