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 2014/01/30 21:19:49 UTC
svn commit: r1562947 - in
/commons/proper/dbcp/branches/DBCP_1_5_x_BRANCH/src: changes/changes.xml
java/org/apache/commons/dbcp/cpdsadapter/DriverAdapterCPDS.java
Author: markt
Date: Thu Jan 30 20:19:49 2014
New Revision: 1562947
URL: http://svn.apache.org/r1562947
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/branches/DBCP_1_5_x_BRANCH/src/changes/changes.xml
commons/proper/dbcp/branches/DBCP_1_5_x_BRANCH/src/java/org/apache/commons/dbcp/cpdsadapter/DriverAdapterCPDS.java
Modified: commons/proper/dbcp/branches/DBCP_1_5_x_BRANCH/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/branches/DBCP_1_5_x_BRANCH/src/changes/changes.xml?rev=1562947&r1=1562946&r2=1562947&view=diff
==============================================================================
--- commons/proper/dbcp/branches/DBCP_1_5_x_BRANCH/src/changes/changes.xml (original)
+++ commons/proper/dbcp/branches/DBCP_1_5_x_BRANCH/src/changes/changes.xml Thu Jan 30 20:19:49 2014
@@ -70,6 +70,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.4.1" date="TBD" description="TBD">
<action dev="psteitz" issue="DBCP-367" type="fix" due-to="Ken Tatsushita">
Modified: commons/proper/dbcp/branches/DBCP_1_5_x_BRANCH/src/java/org/apache/commons/dbcp/cpdsadapter/DriverAdapterCPDS.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/branches/DBCP_1_5_x_BRANCH/src/java/org/apache/commons/dbcp/cpdsadapter/DriverAdapterCPDS.java?rev=1562947&r1=1562946&r2=1562947&view=diff
==============================================================================
--- commons/proper/dbcp/branches/DBCP_1_5_x_BRANCH/src/java/org/apache/commons/dbcp/cpdsadapter/DriverAdapterCPDS.java (original)
+++ commons/proper/dbcp/branches/DBCP_1_5_x_BRANCH/src/java/org/apache/commons/dbcp/cpdsadapter/DriverAdapterCPDS.java Thu Jan 30 20:19:49 2014
@@ -343,6 +343,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;
}
}