svn commit: r1562944 - in /commons/proper/dbcp/trunk/src: changes/changes.xml java/org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java

[markt]

Author: markt
Date: Thu Jan 30 20:16:22 2014
New Revision: 1562944

URL: http://svn.apache.org/r1562944
Log:
Fix DBCP-382
Allow accessToUnderlyingConnectionAllowed to be configured when configuration 
takes place via JNDI in a JavaEE container.
Patch provided by Stefan Rempfer

Modified:
    commons/proper/dbcp/trunk/src/changes/changes.xml
    
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.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=1562944&r1=1562943&r2=1562944&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/changes/changes.xml (original)
+++ commons/proper/dbcp/trunk/src/changes/changes.xml Thu Jan 30 20:16:22 2014
@@ -91,6 +91,10 @@ The <action> type attribute can be add,u
         Fix thread safety issues in the SharedPoolDataSource and the
         PerUserPoolDataSource. 
       </action>
+      <action dev="markt" issue="DBCP-382" type="fix" due-to="Stefan Rempfer">
+        Allow accessToUnderlyingConnectionAllowed to be configured when
+        configuration takes place via JNDI in a JavaEE container.
+      </action>
     </release>
     <release version="1.5.1" date="TBD" description="TBD">
       <action dev="markt" issue="DBCP-400" type="fix">

Modified: 
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java
URL: 
http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java?rev=1562944&r1=1562943&r2=1562944&view=diff
==============================================================================
--- 
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java
 (original)
+++ 
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/cpdsadapter/DriverAdapterCPDS.java
 Thu Jan 30 20:16:22 2014
@@ -335,6 +335,12 @@ public class DriverAdapterCPDS
                         Integer.parseInt(ra.getContent().toString()));
                 }
 
+                ra = ref.get("accessToUnderlyingConnectionAllowed");
+                if (ra != null && ra.getContent() != null) {
+                    setAccessToUnderlyingConnectionAllowed(
+                            
Boolean.valueOf(ra.getContent().toString()).booleanValue());
+                }
+
                 cpds = this;
             }
         }