You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2012/04/17 14:32:25 UTC
svn commit: r1327066 - in
/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc:
BasicDataSource.java BasicManagedDataSource.java
Author: rmannibucau
Date: Tue Apr 17 12:32:25 2012
New Revision: 1327066
URL: http://svn.apache.org/viewvc?rev=1327066&view=rev
Log:
managing osgi issue with dynamic mbeans for datasource pools
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/BasicDataSource.java
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/BasicManagedDataSource.java
Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/BasicDataSource.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/BasicDataSource.java?rev=1327066&r1=1327065&r2=1327066&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/BasicDataSource.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/BasicDataSource.java Tue Apr 17 12:32:25 2012
@@ -50,8 +50,10 @@ public class BasicDataSource extends org
private void registerAsMbean(final String name) {
try {
jmxDs = new JMXBasicDataSource(name, this);
- } catch (Exception ignored) {
- // probably osgi where dynamic mbean is not supported
+ } catch (Exception e) {
+ jmxDs = null;
+ } catch (NoClassDefFoundError ncdfe) { // OSGi
+ jmxDs = null;
}
}
Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/BasicManagedDataSource.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/BasicManagedDataSource.java?rev=1327066&r1=1327065&r2=1327066&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/BasicManagedDataSource.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/BasicManagedDataSource.java Tue Apr 17 12:32:25 2012
@@ -49,8 +49,10 @@ public class BasicManagedDataSource exte
private void registerAsMbean(final String name) {
try {
jmxDs = new JMXBasicDataSource(name, this);
- } catch (Exception ignored) {
- // probably osgi where dynamic mbean is not supported
+ } catch (Exception e) {
+ jmxDs = null;
+ } catch (NoClassDefFoundError ncdfe) { // OSGi
+ jmxDs = null;
}
}