This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new 28eac4c16f Final pass to align DBCP 10.1.x/11.0.x
28eac4c16f is described below
commit 28eac4c16fc981ced1eeb83f1d75b7cef3e8a6aa
Author: Mark Thomas <[email protected]>
AuthorDate: Thu Mar 5 13:11:13 2026 +0000
Final pass to align DBCP 10.1.x/11.0.x
---
java/org/apache/tomcat/dbcp/dbcp2/PoolingDataSource.java | 2 +-
.../tomcat/dbcp/dbcp2/datasources/PerUserPoolDataSourceFactory.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/tomcat/dbcp/dbcp2/PoolingDataSource.java
b/java/org/apache/tomcat/dbcp/dbcp2/PoolingDataSource.java
index 0aa3441a9b..856036f8cf 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/PoolingDataSource.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/PoolingDataSource.java
@@ -129,7 +129,7 @@ public class PoolingDataSource<C extends Connection>
implements DataSource, Auto
}
/**
- * Returns a {@link java.sql.Connection} from my pool, according to the
contract specified by
+ * Returns a {@link Connection} from my pool, according to the contract
specified by
* {@link ObjectPool#borrowObject}.
*/
@Override
diff --git
a/java/org/apache/tomcat/dbcp/dbcp2/datasources/PerUserPoolDataSourceFactory.java
b/java/org/apache/tomcat/dbcp/dbcp2/datasources/PerUserPoolDataSourceFactory.java
index 5693d9d95b..15d1c6751f 100644
---
a/java/org/apache/tomcat/dbcp/dbcp2/datasources/PerUserPoolDataSourceFactory.java
+++
b/java/org/apache/tomcat/dbcp/dbcp2/datasources/PerUserPoolDataSourceFactory.java
@@ -24,7 +24,7 @@ import javax.naming.RefAddr;
import javax.naming.Reference;
/**
- * A JNDI ObjectFactory which creates {@code SharedPoolDataSource}s
+ * A JNDI ObjectFactory which creates {@link SharedPoolDataSource}s
*
* @since 2.0
*/
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
