Author: markt Date: Fri Aug 7 11:02:40 2015 New Revision: 1694660 URL: http://svn.apache.org/r1694660 Log: Update to Pool to 2.4.2 release
Modified: tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/ (props changed) tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/BaseObjectPoolConfig.java tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/DefaultPooledObject.java Propchange: tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Aug 7 11:02:40 2015 @@ -1 +1 @@ -/commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2:1593516-1682319 +/commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2:1593516-1693755 Modified: tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/BaseObjectPoolConfig.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/BaseObjectPoolConfig.java?rev=1694660&r1=1694659&r2=1694660&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/BaseObjectPoolConfig.java (original) +++ tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/BaseObjectPoolConfig.java Fri Aug 7 11:02:40 2015 @@ -187,7 +187,7 @@ public abstract class BaseObjectPoolConf // TODO Consider changing this to a single property for 3.x private String jmxNamePrefix = DEFAULT_JMX_NAME_PREFIX; - private String jmxNameBase = DEFAULT_JMX_NAME_PREFIX; + private String jmxNameBase = DEFAULT_JMX_NAME_BASE; /** Modified: tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/DefaultPooledObject.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/DefaultPooledObject.java?rev=1694660&r1=1694659&r2=1694660&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/DefaultPooledObject.java (original) +++ tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/DefaultPooledObject.java Fri Aug 7 11:02:40 2015 @@ -241,13 +241,19 @@ public class DefaultPooledObject<T> impl @Override public void printStackTrace(PrintWriter writer) { + boolean written = false; Exception borrowedByCopy = this.borrowedBy; if (borrowedByCopy != null) { borrowedByCopy.printStackTrace(writer); + written = true; } Exception usedByCopy = this.usedBy; if (usedByCopy != null) { usedByCopy.printStackTrace(writer); + written = true; + } + if (written) { + writer.flush(); } } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org