Author: markt Date: Wed Jan 20 15:03:53 2016 New Revision: 1725737 URL: http://svn.apache.org/viewvc?rev=1725737&view=rev Log: Merge in a Javadoc fix from pool2 (update to latest trunk)
Modified: tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/ (props changed) tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/GenericObjectPool.java Propchange: tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Jan 20 15:03:53 2016 @@ -1 +1 @@ -/commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2:1593516-1725731 +/commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2:1593516-1725736 Modified: tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/GenericObjectPool.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/GenericObjectPool.java?rev=1725737&r1=1725736&r2=1725737&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/GenericObjectPool.java (original) +++ tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/GenericObjectPool.java Wed Jan 20 15:03:53 2016 @@ -324,7 +324,7 @@ public class GenericObjectPool<T> extend * * @see AbandonedConfig */ - public void setAbandonedConfig(AbandonedConfig abandonedConfig) throws IllegalArgumentException { + public void setAbandonedConfig(AbandonedConfig abandonedConfig) { if (abandonedConfig == null) { this.abandonedConfig = null; } else { --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org