svn commit: r1822755 - /tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSource.java

[kfujino]

Author: kfujino
Date: Wed Jan 31 05:50:29 2018
New Revision: 1822755

URL: http://svn.apache.org/viewvc?rev=1822755&view=rev
Log:
use utility 
Modified:
    
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSource.java

Modified: 
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSource.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSource.java?rev=1822755&r1=1822754&r2=1822755&view=diff
==============================================================================
--- 
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSource.java
 (original)
+++ 
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSource.java
 Wed Jan 31 05:50:29 2018
@@ -16,10 +16,8 @@
  */
 package org.apache.tomcat.jdbc.pool;
 
-import java.lang.management.ManagementFactory;
 import java.util.Hashtable;
 
-import javax.management.InstanceNotFoundException;
 import javax.management.MBeanRegistration;
 import javax.management.MBeanServer;
 import javax.management.MalformedObjectNameException;
@@ -27,6 +25,7 @@ import javax.management.ObjectName;
 
 import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
+import org.apache.tomcat.jdbc.pool.jmx.JmxUtil;
 
 
 /**
@@ -132,13 +131,8 @@ public class DataSource extends DataSour
      * Registers the ConnectionPoolMBean under a unique name based on the 
ObjectName for the DataSource
      */
     protected void registerJmx() {
-        try {
-            if (pool.getJmxPool()!=null) {
-                MBeanServer mbs = ManagementFactory.getPlatformMBeanServer();
-                mbs.registerMBean(pool.getJmxPool(), oname);
-            }
-        } catch (Exception e) {
-            log.error("Unable to register JDBC pool with JMX",e);
+        if (pool.getJmxPool()!=null) {
+            JmxUtil.registerJmx(oname, null, pool.getJmxPool());
         }
     }
 
@@ -146,15 +140,6 @@ public class DataSource extends DataSour
      *
      */
     protected void unregisterJmx() {
-        try {
-            MBeanServer mbs = ManagementFactory.getPlatformMBeanServer();
-            mbs.unregisterMBean(oname);
-        } catch (InstanceNotFoundException ignore) {
-            // NOOP
-        } catch (Exception e) {
-            log.error("Unable to unregister JDBC pool with JMX",e);
-        }
+        JmxUtil.unregisterJmx(oname);
     }
-
-
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org