Register MBean when DataSource Resource type=javax.sql.XADataSource. Patch provided by Masafumi Miura.
This commit also includes a follow up from trunk, r1829084
git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc8.0.x/trunk@1829311 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/java/org/apache/catalina/core/NamingContextListener.java b/java/org/apache/catalina/core/NamingContextListener.java
index 368ecd5..84ce47e 100644
--- a/java/org/apache/catalina/core/NamingContextListener.java
+++ b/java/org/apache/catalina/core/NamingContextListener.java
@@ -963,7 +963,8 @@
logger.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);
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 20e3c58..f2d1c23 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -53,6 +53,11 @@
response that consisted almost entirely of surrogate pairs could result
in one surrogate pair being dropped. (markt)
</fix>
+ <fix>
+ Register MBean when DataSource Resource <code>
+ type="javax.sql.XADataSource"</code>. Patch provided by Masafumi Miura.
+ (csutherl)
+ </fix>
</changelog>
</subsection>
</section>
