Author: psteitz Date: Thu Feb 19 04:05:33 2015 New Revision: 1660787 URL: http://svn.apache.org/r1660787 Log: Made new getter names less ugly; fixed some javadoc tags.
Modified: commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/BasicDataSourceMXBean.java Modified: commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java?rev=1660787&r1=1660786&r2=1660787&view=diff ============================================================================== --- commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java (original) +++ commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java Thu Feb 19 04:05:33 2015 @@ -1284,7 +1284,7 @@ public class BasicDataSource implements * @since 2.1 */ @Override - public boolean isLogExpiredConnections() { + public boolean getLogExpiredConnections() { return logExpiredConnections; } @@ -1409,13 +1409,13 @@ public class BasicDataSource implements * <p> * Overrides the defaults in {@link Utils#DISCONNECTION_SQL_CODES} * (plus anything starting with {@link Utils#DISCONNECTION_SQL_CODE_PREFIX}). - * If this property is non-null and {@link #isFastFailValidation()} is + * If this property is non-null and {@link #getFastFailValidation()} is * {@code true}, whenever connections created by this datasource generate exceptions * with SQL_STATE codes in this list, they will be marked as "fatally disconnected" * and subsequent validations will fail fast (no attempt at isValid or validation * query).</p> * <p> - * If {@link #isFastFailValidation()} is {@code false} setting this property has no + * If {@link #getFastFailValidation()} is {@code false} setting this property has no * effect.</p> * <p> * Note: this method currently has no effect once the pool has been @@ -1455,12 +1455,12 @@ public class BasicDataSource implements * @since 2.1 */ @Override - public boolean isFastFailValidation() { + public boolean getFastFailValidation() { return fastFailValidation; } /** - * @see #isFastFailValidation() + * @see #getFastFailValidation() * @param fastFailValidation true means connections created by this factory will * fast fail validation * @since 2.1 @@ -1632,7 +1632,7 @@ public class BasicDataSource implements * <p>Flag to remove abandoned connections if they exceed the * removeAbandonedTimeout when borrowObject is invoked.</p> * - * <p>The default value is false.<p> + * <p>The default value is false.</p> * * <p>If set to true a connection is considered abandoned and eligible * for removal if it has not been used for more than @@ -1673,7 +1673,7 @@ public class BasicDataSource implements * <p>Flag to remove abandoned connections if they exceed the * removeAbandonedTimeout during pool maintenance.</p> * - * <p>The default value is false.<p> + * <p>The default value is false.</p> * * <p>If set to true a connection is considered abandoned and eligible * for removal if it has not been used for more than @@ -1902,7 +1902,7 @@ public class BasicDataSource implements * these connections to the pool, the underlying JDBC connections are closed.</p> * * <p>Attempts to acquire connections using {@link #getConnection()} after this method has been - * invoked result in SQLExceptions.<p> + * invoked result in SQLExceptions.</p> * * <p>This method is idempotent - i.e., closing an already closed BasicDataSource has no effect * and does not generate exceptions.</p> Modified: commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/BasicDataSourceMXBean.java URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/BasicDataSourceMXBean.java?rev=1660787&r1=1660786&r2=1660787&view=diff ============================================================================== --- commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/BasicDataSourceMXBean.java (original) +++ commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/BasicDataSourceMXBean.java Thu Feb 19 04:05:33 2015 @@ -217,11 +217,11 @@ public interface BasicDataSourceMXBean { long getMaxConnLifetimeMillis(); /** - * See {@link BasicDataSource#isLogExpiredConnections()} - * @return {@link BasicDataSource#isLogExpiredConnections()} + * See {@link BasicDataSource#getLogExpiredConnections()} + * @return {@link BasicDataSource#getLogExpiredConnections()} * @since 2.1 */ - boolean isLogExpiredConnections(); + boolean getLogExpiredConnections(); /** * See {@link BasicDataSource#getRemoveAbandonedOnBorrow()} @@ -254,11 +254,11 @@ public interface BasicDataSourceMXBean { boolean isClosed(); /** - * See {@link BasicDataSource#isFastFailValidation()} - * @return {@link BasicDataSource#isFastFailValidation()} + * See {@link BasicDataSource#getFastFailValidation()} + * @return {@link BasicDataSource#getFastFailValidation()} * @since 2.1 */ - boolean isFastFailValidation(); + boolean getFastFailValidation(); /** * See {@link BasicDataSource#getDisconnectionSqlCodesAsArray()}