svn commit: r1499671 - /tomee/tomee/trunk/tomee/tomee-jdbc/src/main/java/org/apache/tomee/jdbc/TomEEDataSourceCreator.java

[rmannibucau]

Author: rmannibucau
Date: Thu Jul  4 07:53:16 2013
New Revision: 1499671

URL: http://svn.apache.org/r1499671
Log:
TOMEE-989 don't use tomcat jmx registration to be able to clean up correctly 
resources and avoid to show up the same info everywhere

Modified:
    
tomee/tomee/trunk/tomee/tomee-jdbc/src/main/java/org/apache/tomee/jdbc/TomEEDataSourceCreator.java

Modified: 
tomee/tomee/trunk/tomee/tomee-jdbc/src/main/java/org/apache/tomee/jdbc/TomEEDataSourceCreator.java
URL: 
http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-jdbc/src/main/java/org/apache/tomee/jdbc/TomEEDataSourceCreator.java?rev=1499671&r1=1499670&r2=1499671&view=diff
==============================================================================
--- 
tomee/tomee/trunk/tomee/tomee-jdbc/src/main/java/org/apache/tomee/jdbc/TomEEDataSourceCreator.java
 (original)
+++ 
tomee/tomee/trunk/tomee/tomee-jdbc/src/main/java/org/apache/tomee/jdbc/TomEEDataSourceCreator.java
 Thu Jul  4 07:53:16 2013
@@ -219,6 +219,16 @@ public class TomEEDataSourceCreator exte
         }
 
         @Override
+        protected void registerJmx() {
+            // no-op
+        }
+
+        @Override
+        protected void unregisterJmx() {
+            // no-op
+        }
+
+        @Override
         public ConnectionPool createPool() throws SQLException {
             if (pool != null) {
                 return pool;
@@ -264,7 +274,7 @@ public class TomEEDataSourceCreator exte
                     if (pool.getJmxPool()!=null) {
                         
LocalMBeanServer.get().registerMBean(pool.getJmxPool(), internalOn);
                     }
-                } catch (Exception e) {
+                } catch (final Exception e) {
                     LOGGER.error("Unable to register JDBC pool with JMX", e);
                 }
             } catch (Exception ignored) {
@@ -276,7 +286,7 @@ public class TomEEDataSourceCreator exte
             if (internalOn != null) {
                 try {
                     LocalMBeanServer.get().unregisterMBean(internalOn);
-                } catch (Exception e) {
+                } catch (final Exception e) {
                     LOGGER.error("Unable to unregister JDBC pool with JMX", e);
                 }
             }