Author: csutherl
Date: Fri Apr 13 14:59:19 2018
New Revision: 1829082
URL: http://svn.apache.org/viewvc?rev=1829082&view=rev
Log:
Register MBean when DataSource Resource type="javax.sql.XADataSource". Patch
provided by Masafumi Miura. (csutherl)
Modified:
tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java?rev=1829082&r1=1829081&r2=1829082&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java Fri
Apr 13 14:59:19 2018
@@ -963,7 +963,8 @@ public class NamingContextListener
log.error(sm.getString("naming.bindFailed", e));
}
- if ("javax.sql.DataSource".equals(ref.getClassName()) &&
+ if ("javax.sql.DataSource".equals(ref.getClassName()) ||
+ "javax.sql.XADataSource".equals(ref.getClassName()) &&
resource.getSingleton()) {
try {
ObjectName on = createObjectName(resource);
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1829082&r1=1829081&r2=1829082&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Apr 13 14:59:19 2018
@@ -57,6 +57,11 @@
the error has caused the connection to the client to be closed as
no-one
will ever see the error page. (markt)
</add>
+ <fix>
+ Register MBean when DataSource Resource <code>
+ type="javax.sql.XADataSource"</code>. Patch provided by Masafumi Miura.
+ (csutherl)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
