This is an automated email from the ASF dual-hosted git repository.
remm 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 791b6af Rename method for consistency
791b6af is described below
commit 791b6afdb3feb6e2a5c1b3b8fd92d4e8361271b4
Author: remm <r...@apache.org>
AuthorDate: Fri Sep 3 10:27:16 2021 +0200
Rename method for consistency
---
.../apache/catalina/users/DataSourceUserDatabase.java | 17 +++++++++--------
.../catalina/users/DataSourceUserDatabaseTests.java | 2 +-
2 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/java/org/apache/catalina/users/DataSourceUserDatabase.java
b/java/org/apache/catalina/users/DataSourceUserDatabase.java
index ec44e8b..99cf584 100644
--- a/java/org/apache/catalina/users/DataSourceUserDatabase.java
+++ b/java/org/apache/catalina/users/DataSourceUserDatabase.java
@@ -74,6 +74,7 @@ public class DataSourceUserDatabase extends
SparseUserDatabase {
protected final ConcurrentHashMap<String, Role> modifiedRoles = new
ConcurrentHashMap<>();
protected final ConcurrentHashMap<String, Role> removedRoles = new
ConcurrentHashMap<>();
+
// ----------------------------------------------------- Instance Variables
@@ -470,7 +471,7 @@ public class DataSourceUserDatabase extends
SparseUserDatabase {
} catch (SQLException e) {
log.error(sm.getString("dataSourceUserDatabase.exception"), e);
} finally {
- close(dbConnection);
+ closeConnection(dbConnection);
}
}
return groups.values().iterator();
@@ -506,7 +507,7 @@ public class DataSourceUserDatabase extends
SparseUserDatabase {
} catch (SQLException e) {
log.error(sm.getString("dataSourceUserDatabase.exception"), e);
} finally {
- close(dbConnection);
+ closeConnection(dbConnection);
}
}
return roles.values().iterator();
@@ -542,7 +543,7 @@ public class DataSourceUserDatabase extends
SparseUserDatabase {
} catch (SQLException e) {
log.error(sm.getString("dataSourceUserDatabase.exception"), e);
} finally {
- close(dbConnection);
+ closeConnection(dbConnection);
}
}
return users.values().iterator();
@@ -623,7 +624,7 @@ public class DataSourceUserDatabase extends
SparseUserDatabase {
try {
return findGroupInternal(dbConnection, groupname);
} finally {
- close(dbConnection);
+ closeConnection(dbConnection);
}
} else {
return null;
@@ -697,7 +698,7 @@ public class DataSourceUserDatabase extends
SparseUserDatabase {
try {
return findRoleInternal(dbConnection, rolename);
} finally {
- close(dbConnection);
+ closeConnection(dbConnection);
}
} else {
return null;
@@ -750,7 +751,7 @@ public class DataSourceUserDatabase extends
SparseUserDatabase {
try {
return findUserInternal(dbConnection, username);
} finally {
- close(dbConnection);
+ closeConnection(dbConnection);
}
} finally {
readLock.unlock();
@@ -1033,7 +1034,7 @@ public class DataSourceUserDatabase extends
SparseUserDatabase {
try {
saveInternal(dbConnection);
} finally {
- close(dbConnection);
+ closeConnection(dbConnection);
}
} finally {
writeLock.unlock();
@@ -1527,7 +1528,7 @@ public class DataSourceUserDatabase extends
SparseUserDatabase {
*
* @param dbConnection The connection to be closed
*/
- protected void close(Connection dbConnection) {
+ protected void closeConnection(Connection dbConnection) {
// Do nothing if the database connection is already closed
if (dbConnection == null) {
diff --git a/test/org/apache/catalina/users/DataSourceUserDatabaseTests.java
b/test/org/apache/catalina/users/DataSourceUserDatabaseTests.java
index 55194e1..0defa39 100644
--- a/test/org/apache/catalina/users/DataSourceUserDatabaseTests.java
+++ b/test/org/apache/catalina/users/DataSourceUserDatabaseTests.java
@@ -89,7 +89,7 @@ public class DataSourceUserDatabaseTests extends
LoggingBaseTest {
return connection;
}
@Override
- protected void close(Connection dbConnection) {
+ protected void closeConnection(Connection dbConnection) {
}
@Override
public void close() throws Exception {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
