--- modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSource.java (revision 1412899)
+++ modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSource.java (working copy)
@@ -98,8 +98,10 @@
     @Override
     public ObjectName preRegister(MBeanServer server, ObjectName name) throws Exception {
         try {
-            this.oname = createObjectName(name);
-            if (oname!=null) registerJmx();
+            if ( isJmxEnabled() ) {
+                this.oname = createObjectName(name);
+                if (oname!=null) registerJmx();
+            }
         }catch (MalformedObjectNameException x) {
             log.error("Unable to create object name for JDBC pool.",x);
         }