tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1596859 - in /tomcat/trunk: java/org/apache/tomcat/dbcp/dbcp2/ java/org/apache/tomcat/dbcp/dbcp2/PoolableConnection.java webapps/docs/changelog.xml
Date Thu, 22 May 2014 13:28:09 GMT
Author: markt
Date: Thu May 22 13:28:08 2014
New Revision: 1596859

URL: http://svn.apache.org/r1596859
Log:
DBCP updates

Modified:
    tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/   (props changed)
    tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolableConnection.java
    tomcat/trunk/webapps/docs/changelog.xml

Propchange: tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/
------------------------------------------------------------------------------
  Merged /commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2:r1593564-1596858

Modified: tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolableConnection.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolableConnection.java?rev=1596859&r1=1596858&r2=1596859&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolableConnection.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/PoolableConnection.java Thu May 22 13:28:08
2014
@@ -44,7 +44,15 @@ import org.apache.tomcat.dbcp.pool2.Obje
 public class PoolableConnection extends DelegatingConnection<Connection>
         implements PoolableConnectionMXBean {
 
-    private static MBeanServer MBEAN_SERVER = ManagementFactory.getPlatformMBeanServer();
+    private static MBeanServer MBEAN_SERVER = null; 
+
+    static {
+        try {
+            MBEAN_SERVER = ManagementFactory.getPlatformMBeanServer();
+        } catch (Exception ex) {
+            // ignore - JMX not available
+        }
+    }
 
     /** The pool to which I should return. */
     private ObjectPool<PoolableConnection> _pool = null;

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1596859&r1=1596858&r2=1596859&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu May 22 13:28:08 2014
@@ -131,6 +131,13 @@
       </scode>
     </changelog>
   </subsection>
+  <subsection name="Other">
+    <changelog>
+      <update>
+        Update package renamed Apache Commons DBCP2 to r1596858. (markt)
+      </update>
+    </changelog>
+  </subsection>
 </section>
 <section name="Tomcat 8.0.8 (markt)" rtext="beta, 2014-05-21">
   <subsection name="Catalina">



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


Mime
View raw message