This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new 35b268b Fix backport
35b268b is described below
commit 35b268b5d3ab3173bce6bd42ab3f1cef3d46e33e
Author: Mark Thomas <[email protected]>
AuthorDate: Thu Aug 1 21:46:34 2019 +0100
Fix backport
---
java/org/apache/tomcat/dbcp/pool2/PooledObject.java | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/java/org/apache/tomcat/dbcp/pool2/PooledObject.java
b/java/org/apache/tomcat/dbcp/pool2/PooledObject.java
index 173a5d2..361b3d8 100644
--- a/java/org/apache/tomcat/dbcp/pool2/PooledObject.java
+++ b/java/org/apache/tomcat/dbcp/pool2/PooledObject.java
@@ -59,12 +59,10 @@ public interface PooledObject<T> extends
Comparable<PooledObject<T>> {
/**
* Gets the number of times this object has been borrowed.
*
- * @return -1 by default for old implementations prior to release 2.7.0.
+ * @return The number of times this object has been borrowed.
* @since 2.7.0
*/
- default long getBorrowedCount() {
- return -1;
- }
+ long getBorrowedCount();
/**
* Obtains the time in milliseconds that this object last spend in the
@@ -187,9 +185,7 @@ public interface PooledObject<T> extends
Comparable<PooledObject<T>> {
* @param requireFullStackTrace the new configuration setting for
abandoned object logging
* @since 2.7.0
*/
- default void setRequireFullStackTrace(boolean requireFullStackTrace) {
- // noop
- }
+ void setRequireFullStackTrace(boolean requireFullStackTrace);
/**
* Record the current stack trace as the last time the object was used.
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
