This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new 39ff17cd49 Review DBCP fork against DBCP 2.14.0
39ff17cd49 is described below
commit 39ff17cd49d0d748bdcd2446b94559d5699e7b39
Author: Mark Thomas <[email protected]>
AuthorDate: Thu Mar 5 09:52:14 2026 +0000
Review DBCP fork against DBCP 2.14.0
It looks like some (nearly all) cosmetic changes were missed.
---
.../dbcp/dbcp2/DelegatingCallableStatement.java | 2 +-
.../dbcp/dbcp2/DelegatingDatabaseMetaData.java | 7 ++---
.../tomcat/dbcp/dbcp2/DelegatingResultSet.java | 13 +++++----
.../tomcat/dbcp/dbcp2/DriverConnectionFactory.java | 2 +-
.../apache/tomcat/dbcp/dbcp2/ListException.java | 5 +++-
java/org/apache/tomcat/dbcp/dbcp2/PStmtKey.java | 33 +++++-----------------
.../dbcp/dbcp2/PoolableCallableStatement.java | 2 +-
.../dbcp/dbcp2/PoolableConnectionMXBean.java | 2 +-
.../dbcp/dbcp2/PoolablePreparedStatement.java | 2 +-
.../tomcat/dbcp/dbcp2/PoolingDataSource.java | 3 +-
.../apache/tomcat/dbcp/dbcp2/SQLExceptionList.java | 6 +++-
.../dbcp/dbcp2/SwallowedExceptionLogger.java | 2 +-
.../datasources/PerUserPoolDataSourceFactory.java | 2 +-
.../dbcp2/datasources/PooledConnectionAndInfo.java | 2 +-
.../datasources/SharedPoolDataSourceFactory.java | 2 +-
.../dbcp/dbcp2/datasources/package-info.java | 2 +-
.../dbcp/dbcp2/managed/BasicManagedDataSource.java | 4 +--
.../dbcp/dbcp2/managed/ManagedDataSource.java | 2 +-
.../dbcp2/managed/PoolableManagedConnection.java | 2 +-
.../dbcp/dbcp2/managed/SynchronizationAdapter.java | 2 +-
.../dbcp2/managed/TransactionContextListener.java | 2 +-
.../dbcp/dbcp2/managed/XAConnectionFactory.java | 2 +-
.../tomcat/dbcp/dbcp2/managed/package-info.java | 3 +-
.../org/apache/tomcat/dbcp/dbcp2/package-info.java | 2 +-
24 files changed, 46 insertions(+), 60 deletions(-)
diff --git a/java/org/apache/tomcat/dbcp/dbcp2/DelegatingCallableStatement.java
b/java/org/apache/tomcat/dbcp/dbcp2/DelegatingCallableStatement.java
index 1f365e2292..c28a4031aa 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/DelegatingCallableStatement.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/DelegatingCallableStatement.java
@@ -6,7 +6,7 @@
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/java/org/apache/tomcat/dbcp/dbcp2/DelegatingDatabaseMetaData.java
b/java/org/apache/tomcat/dbcp/dbcp2/DelegatingDatabaseMetaData.java
index 573fe08d9a..a8c2d0f397 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/DelegatingDatabaseMetaData.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/DelegatingDatabaseMetaData.java
@@ -6,7 +6,7 @@
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -580,10 +580,7 @@ public class DelegatingDatabaseMetaData implements
DatabaseMetaData {
@Override
public boolean isWrapperFor(final Class<?> iface) throws SQLException {
- if (iface.isAssignableFrom(getClass())) {
- return true;
- }
- if (iface.isAssignableFrom(databaseMetaData.getClass())) {
+ if (iface.isAssignableFrom(getClass()) ||
iface.isAssignableFrom(databaseMetaData.getClass())) {
return true;
}
return databaseMetaData.isWrapperFor(iface);
diff --git a/java/org/apache/tomcat/dbcp/dbcp2/DelegatingResultSet.java
b/java/org/apache/tomcat/dbcp/dbcp2/DelegatingResultSet.java
index cbee420a75..c40c1f8bac 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/DelegatingResultSet.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/DelegatingResultSet.java
@@ -6,7 +6,7 @@
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -1052,6 +1052,12 @@ public final class DelegatingResultSet extends
AbandonedTrace implements ResultS
}
}
+ /**
+ * Handles a SQL exception by delegating to a DelegatingStatement or
DelegatingConnection.
+ *
+ * @param e The exception to handle.
+ * @throws SQLException Throws the given exception if not handled.
+ */
protected void handleException(final SQLException e) throws SQLException {
if (statement instanceof DelegatingStatement) {
((DelegatingStatement) statement).handleException(e);
@@ -1123,10 +1129,7 @@ public final class DelegatingResultSet extends
AbandonedTrace implements ResultS
@Override
public boolean isWrapperFor(final Class<?> iface) throws SQLException {
- if (iface.isAssignableFrom(getClass())) {
- return true;
- }
- if (iface.isAssignableFrom(resultSet.getClass())) {
+ if (iface.isAssignableFrom(getClass()) ||
iface.isAssignableFrom(resultSet.getClass())) {
return true;
}
return resultSet.isWrapperFor(iface);
diff --git a/java/org/apache/tomcat/dbcp/dbcp2/DriverConnectionFactory.java
b/java/org/apache/tomcat/dbcp/dbcp2/DriverConnectionFactory.java
index 8dfb107d06..f9c287042c 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/DriverConnectionFactory.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/DriverConnectionFactory.java
@@ -6,7 +6,7 @@
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/java/org/apache/tomcat/dbcp/dbcp2/ListException.java
b/java/org/apache/tomcat/dbcp/dbcp2/ListException.java
index 5c6976817e..2d1a45682f 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/ListException.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/ListException.java
@@ -6,7 +6,7 @@
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -27,6 +27,9 @@ public class ListException extends Exception {
private static final long serialVersionUID = 1L;
+ /**
+ * A list of causes.
+ */
private final List<Throwable> exceptionList;
/**
diff --git a/java/org/apache/tomcat/dbcp/dbcp2/PStmtKey.java
b/java/org/apache/tomcat/dbcp/dbcp2/PStmtKey.java
index ad47430726..40c85522ec 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/PStmtKey.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/PStmtKey.java
@@ -6,7 +6,7 @@
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -516,35 +516,16 @@ public class PStmtKey {
if (this == obj) {
return true;
}
- if (obj == null) {
- return false;
- }
- if (getClass() != obj.getClass()) {
+ if (obj == null || getClass() != obj.getClass()) {
return false;
}
final PStmtKey other = (PStmtKey) obj;
- if (!Objects.equals(autoGeneratedKeys, other.autoGeneratedKeys)) {
- return false;
- }
- if (!Objects.equals(catalog, other.catalog)) {
- return false;
- }
- if (!Arrays.equals(columnIndexes, other.columnIndexes)) {
- return false;
- }
- if (!Arrays.equals(columnNames, other.columnNames)) {
- return false;
- }
- if (!Objects.equals(resultSetConcurrency, other.resultSetConcurrency))
{
- return false;
- }
- if (!Objects.equals(resultSetHoldability, other.resultSetHoldability))
{
- return false;
- }
- if (!Objects.equals(resultSetType, other.resultSetType)) {
+ if (!Objects.equals(autoGeneratedKeys, other.autoGeneratedKeys) ||
!Objects.equals(catalog, other.catalog)
+ || !Arrays.equals(columnIndexes, other.columnIndexes) ||
!Arrays.equals(columnNames, other.columnNames)) {
return false;
}
- if (!Objects.equals(schema, other.schema)) {
+ if (!Objects.equals(resultSetConcurrency, other.resultSetConcurrency)
|| !Objects.equals(resultSetHoldability, other.resultSetHoldability)
+ || !Objects.equals(resultSetType, other.resultSetType) ||
!Objects.equals(schema, other.schema)) {
return false;
}
if (!Objects.equals(sql, other.sql)) {
@@ -650,7 +631,7 @@ public class PStmtKey {
@Override
public int hashCode() {
return Objects.hash(autoGeneratedKeys, catalog,
Integer.valueOf(Arrays.hashCode(columnIndexes)),
Integer.valueOf(Arrays.hashCode(columnNames)),
- resultSetConcurrency, resultSetHoldability, resultSetType, schema,
sql, statementType);
+ resultSetConcurrency, resultSetHoldability, resultSetType,
schema, sql, statementType);
}
@Override
diff --git a/java/org/apache/tomcat/dbcp/dbcp2/PoolableCallableStatement.java
b/java/org/apache/tomcat/dbcp/dbcp2/PoolableCallableStatement.java
index d2a2161362..8880db761d 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/PoolableCallableStatement.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/PoolableCallableStatement.java
@@ -6,7 +6,7 @@
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/java/org/apache/tomcat/dbcp/dbcp2/PoolableConnectionMXBean.java
b/java/org/apache/tomcat/dbcp/dbcp2/PoolableConnectionMXBean.java
index e3b4bf8bf5..083bbf17b1 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/PoolableConnectionMXBean.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/PoolableConnectionMXBean.java
@@ -6,7 +6,7 @@
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/java/org/apache/tomcat/dbcp/dbcp2/PoolablePreparedStatement.java
b/java/org/apache/tomcat/dbcp/dbcp2/PoolablePreparedStatement.java
index 9ff65986cc..f9a9203d35 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/PoolablePreparedStatement.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/PoolablePreparedStatement.java
@@ -6,7 +6,7 @@
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/java/org/apache/tomcat/dbcp/dbcp2/PoolingDataSource.java
b/java/org/apache/tomcat/dbcp/dbcp2/PoolingDataSource.java
index b7473e4f88..0aa3441a9b 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/PoolingDataSource.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/PoolingDataSource.java
@@ -6,7 +6,7 @@
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -164,7 +164,6 @@ public class PoolingDataSource<C extends Connection>
implements DataSource, Auto
throw new UnsupportedOperationException();
}
-
/**
* Throws {@link UnsupportedOperationException}.
*
diff --git a/java/org/apache/tomcat/dbcp/dbcp2/SQLExceptionList.java
b/java/org/apache/tomcat/dbcp/dbcp2/SQLExceptionList.java
index 4d37d6386b..bcf8c74d93 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/SQLExceptionList.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/SQLExceptionList.java
@@ -6,7 +6,7 @@
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -31,6 +31,10 @@ import java.util.List;
public class SQLExceptionList extends SQLException {
private static final long serialVersionUID = 1L;
+
+ /**
+ * The list of causes.
+ */
private final List<? extends Throwable> causeList;
/**
diff --git a/java/org/apache/tomcat/dbcp/dbcp2/SwallowedExceptionLogger.java
b/java/org/apache/tomcat/dbcp/dbcp2/SwallowedExceptionLogger.java
index 99f0e1659a..b5e5c119bb 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/SwallowedExceptionLogger.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/SwallowedExceptionLogger.java
@@ -6,7 +6,7 @@
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git
a/java/org/apache/tomcat/dbcp/dbcp2/datasources/PerUserPoolDataSourceFactory.java
b/java/org/apache/tomcat/dbcp/dbcp2/datasources/PerUserPoolDataSourceFactory.java
index df53faa0b9..5693d9d95b 100644
---
a/java/org/apache/tomcat/dbcp/dbcp2/datasources/PerUserPoolDataSourceFactory.java
+++
b/java/org/apache/tomcat/dbcp/dbcp2/datasources/PerUserPoolDataSourceFactory.java
@@ -6,7 +6,7 @@
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git
a/java/org/apache/tomcat/dbcp/dbcp2/datasources/PooledConnectionAndInfo.java
b/java/org/apache/tomcat/dbcp/dbcp2/datasources/PooledConnectionAndInfo.java
index ecbe1b451b..2bef70c460 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/datasources/PooledConnectionAndInfo.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/datasources/PooledConnectionAndInfo.java
@@ -6,7 +6,7 @@
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git
a/java/org/apache/tomcat/dbcp/dbcp2/datasources/SharedPoolDataSourceFactory.java
b/java/org/apache/tomcat/dbcp/dbcp2/datasources/SharedPoolDataSourceFactory.java
index ca405f8405..a0a349edb5 100644
---
a/java/org/apache/tomcat/dbcp/dbcp2/datasources/SharedPoolDataSourceFactory.java
+++
b/java/org/apache/tomcat/dbcp/dbcp2/datasources/SharedPoolDataSourceFactory.java
@@ -6,7 +6,7 @@
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/java/org/apache/tomcat/dbcp/dbcp2/datasources/package-info.java
b/java/org/apache/tomcat/dbcp/dbcp2/datasources/package-info.java
index ab303af3c3..c7417a94f5 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/datasources/package-info.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/datasources/package-info.java
@@ -6,7 +6,7 @@
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git
a/java/org/apache/tomcat/dbcp/dbcp2/managed/BasicManagedDataSource.java
b/java/org/apache/tomcat/dbcp/dbcp2/managed/BasicManagedDataSource.java
index e456811bca..64998aa2cf 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/managed/BasicManagedDataSource.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/managed/BasicManagedDataSource.java
@@ -6,7 +6,7 @@
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -68,7 +68,7 @@ public class BasicManagedDataSource extends BasicDataSource {
private transient TransactionSynchronizationRegistry
transactionSynchronizationRegistry;
@Override
- protected ConnectionFactory createConnectionFactory() throws SQLException {
+ protected synchronized ConnectionFactory createConnectionFactory() throws
SQLException {
if (transactionManager == null) {
throw new SQLException("Transaction manager must be set before a
connection can be created");
}
diff --git a/java/org/apache/tomcat/dbcp/dbcp2/managed/ManagedDataSource.java
b/java/org/apache/tomcat/dbcp/dbcp2/managed/ManagedDataSource.java
index 802b0362a9..d25c193929 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/managed/ManagedDataSource.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/managed/ManagedDataSource.java
@@ -6,7 +6,7 @@
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git
a/java/org/apache/tomcat/dbcp/dbcp2/managed/PoolableManagedConnection.java
b/java/org/apache/tomcat/dbcp/dbcp2/managed/PoolableManagedConnection.java
index 05d5a132a3..e400a867a7 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/managed/PoolableManagedConnection.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/managed/PoolableManagedConnection.java
@@ -6,7 +6,7 @@
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git
a/java/org/apache/tomcat/dbcp/dbcp2/managed/SynchronizationAdapter.java
b/java/org/apache/tomcat/dbcp/dbcp2/managed/SynchronizationAdapter.java
index c7969d242e..4bc4eb6676 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/managed/SynchronizationAdapter.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/managed/SynchronizationAdapter.java
@@ -6,7 +6,7 @@
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git
a/java/org/apache/tomcat/dbcp/dbcp2/managed/TransactionContextListener.java
b/java/org/apache/tomcat/dbcp/dbcp2/managed/TransactionContextListener.java
index c447ecb01d..1fa74b8226 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/managed/TransactionContextListener.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/managed/TransactionContextListener.java
@@ -6,7 +6,7 @@
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/java/org/apache/tomcat/dbcp/dbcp2/managed/XAConnectionFactory.java
b/java/org/apache/tomcat/dbcp/dbcp2/managed/XAConnectionFactory.java
index 07b6dec7d8..ae30c00158 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/managed/XAConnectionFactory.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/managed/XAConnectionFactory.java
@@ -6,7 +6,7 @@
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/java/org/apache/tomcat/dbcp/dbcp2/managed/package-info.java
b/java/org/apache/tomcat/dbcp/dbcp2/managed/package-info.java
index ca00170f9c..865abce484 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/managed/package-info.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/managed/package-info.java
@@ -6,7 +6,7 @@
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -29,7 +29,6 @@
* transaction is committed or rolled back the enlisted connections are
* committed or rolled back.
* </p>
- *
* <p>
* This package supports full XADataSources and non-XA data sources using
* local transaction semantics. non-XA data sources commit and rollback as
diff --git a/java/org/apache/tomcat/dbcp/dbcp2/package-info.java
b/java/org/apache/tomcat/dbcp/dbcp2/package-info.java
index cfccb0df96..d7419898b9 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/package-info.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/package-info.java
@@ -6,7 +6,7 @@
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
