Author: remm
Date: Wed Sep 12 12:59:40 2018
New Revision: 1840674
URL: http://svn.apache.org/viewvc?rev=1840674&view=rev
Log:
Port single DBCP commit d49d45e.
Modified:
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/managed/BasicManagedDataSource.java
tomcat/trunk/webapps/docs/changelog.xml
Modified:
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/managed/BasicManagedDataSource.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/managed/BasicManagedDataSource.java?rev=1840674&r1=1840673&r2=1840674&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/managed/BasicManagedDataSource.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/managed/BasicManagedDataSource.java
Wed Sep 12 12:59:40 2018
@@ -29,6 +29,7 @@ import org.apache.tomcat.dbcp.dbcp2.Conn
import org.apache.tomcat.dbcp.dbcp2.PoolableConnection;
import org.apache.tomcat.dbcp.dbcp2.PoolableConnectionFactory;
import org.apache.tomcat.dbcp.dbcp2.PoolingDataSource;
+import org.apache.tomcat.dbcp.dbcp2.Utils;
/**
* <p>
@@ -63,7 +64,7 @@ public class BasicManagedDataSource exte
/** XA data source instance */
private XADataSource xaDataSourceInstance;
- /** Transaction Manager */
+ /** Transaction Synchronization Registry */
private transient TransactionSynchronizationRegistry
transactionSynchronizationRegistry;
/**
@@ -198,7 +199,7 @@ public class BasicManagedDataSource exte
// finally, create the XAConnectionFactory using the XA data source
final XAConnectionFactory xaConnectionFactory = new
DataSourceXAConnectionFactory(getTransactionManager(),
- xaDataSourceInstance, getUsername(), getPassword());
+ xaDataSourceInstance, getUsername(),
Utils.toCharArray(getPassword()), getTransactionSynchronizationRegistry());
transactionRegistry = xaConnectionFactory.getTransactionRegistry();
return xaConnectionFactory;
}
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1840674&r1=1840673&r2=1840674&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed Sep 12 12:59:40 2018
@@ -61,6 +61,14 @@
</fix>
</changelog>
</subsection>
+ <subsection name="Other">
+ <changelog>
+ <fix>
+ Port DBCP transaction synchronization registry fix
+ (commit d49d45e). (remm)
+ </fix>
+ </changelog>
+ </subsection>
</section>
<section name="Tomcat 9.0.12 (markt)" rtext="2018-09-10">
<subsection name="Catalina">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
