From 4256ae18ab08f4a36a99fd2c34329fe2b93270af Mon Sep 17 00:00:00 2001
From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Thu, 31 Mar 2011 13:22:11 +0000
Subject: [PATCH] Only register a DataSource with JMX if it is a singleton

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1087292 13f79535-47bb-0310-9956-ffa450edef68
---
 java/org/apache/catalina/core/NamingContextListener.java | 3 ++-
 webapps/docs/changelog.xml                               | 3 +++
 webapps/docs/config/context.xml                          | 7 +++++--
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/java/org/apache/catalina/core/NamingContextListener.java b/java/org/apache/catalina/core/NamingContextListener.java
index ef9777b31..3f3660e61 100644
--- a/java/org/apache/catalina/core/NamingContextListener.java
+++ b/java/org/apache/catalina/core/NamingContextListener.java
@@ -1014,7 +1014,8 @@ public class NamingContextListener
             logger.error(sm.getString("naming.bindFailed", e));
         }
 
-        if ("javax.sql.DataSource".equals(ref.getClassName())) {
+        if ("javax.sql.DataSource".equals(ref.getClassName()) &&
+                resource.getSingleton()) {
             try {
                 ObjectName on = createObjectName(resource);
                 Object actualResource = envCtx.lookup(resource.getName());
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 65930df45..8e35a7593 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -134,6 +134,9 @@
         Don&apos;t append the jvmRoute to a session ID if the jvmRoute is a zero
         length string. (markt) 
       </fix>
+      <fix>
+        Don&apos;t register non-singelton DataSource resources with JMX. (markt)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Coyote">
diff --git a/webapps/docs/config/context.xml b/webapps/docs/config/context.xml
index d99858875..abc727621 100644
--- a/webapps/docs/config/context.xml
+++ b/webapps/docs/config/context.xml
@@ -1044,8 +1044,11 @@
         attribute is <code>true</code>, multiple JNDI lookups for this resource
         will return the same object. If this attribute is <code>false</code>,
         multiple JNDI lookups for this resource will return different objects.
-        The value of this attribute must be <code>true</code> or
-        <code>false</code>. By default, this attribute is <code>true</code>.</p>
+        This attribute must be <code>true</code> for
+        <code>javax.sql.DataSource</code> resources to enable JMX registration
+        of the DataSource. The value of this attribute must be <code>true</code>
+        or <code>false</code>. By default, this attribute is <code>true</code>.
+        </p>
       </attribute>
 
       <attribute name="type" required="true">
-- 
2.11.0