This is an automated email from the ASF dual-hosted git repository.
rmaucher 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 a1b11c5f0e Add null checks
a1b11c5f0e is described below
commit a1b11c5f0ef145512cb58bcd16f4372dd6290a14
Author: remm <[email protected]>
AuthorDate: Tue May 26 22:11:13 2026 +0200
Add null checks
---
java/org/apache/catalina/users/GenericGroup.java | 2 +-
java/org/apache/catalina/users/GenericRole.java | 2 +-
java/org/apache/catalina/users/GenericUser.java | 2 +-
java/org/apache/catalina/users/MemoryUserDatabaseFactory.java | 4 ++--
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/java/org/apache/catalina/users/GenericGroup.java
b/java/org/apache/catalina/users/GenericGroup.java
index 1003d4bcb1..10b33f67ff 100644
--- a/java/org/apache/catalina/users/GenericGroup.java
+++ b/java/org/apache/catalina/users/GenericGroup.java
@@ -144,7 +144,7 @@ public class GenericGroup<UD extends UserDatabase> extends
AbstractGroup {
if (obj instanceof GenericGroup) {
GenericGroup<?> group = (GenericGroup<?>) obj;
return group.database == database &&
- ((groupname == null && group.getGroupname() == null) ||
groupname.equals(group.getGroupname()));
+ ((groupname == null && group.getGroupname() == null) ||
(groupname != null && groupname.equals(group.getGroupname())));
}
return super.equals(obj);
}
diff --git a/java/org/apache/catalina/users/GenericRole.java
b/java/org/apache/catalina/users/GenericRole.java
index 27efe04fe1..339cc2bf4d 100644
--- a/java/org/apache/catalina/users/GenericRole.java
+++ b/java/org/apache/catalina/users/GenericRole.java
@@ -87,7 +87,7 @@ public class GenericRole<UD extends UserDatabase> extends
AbstractRole {
if (obj instanceof GenericRole) {
GenericRole<?> role = (GenericRole<?>) obj;
return role.database == database &&
- ((rolename == null && role.getRolename() == null) ||
rolename.equals(role.getRolename()));
+ ((rolename == null && role.getRolename() == null) ||
(rolename != null && rolename.equals(role.getRolename())));
}
return super.equals(obj);
}
diff --git a/java/org/apache/catalina/users/GenericUser.java
b/java/org/apache/catalina/users/GenericUser.java
index 7dca4521cc..8e8a1b6cac 100644
--- a/java/org/apache/catalina/users/GenericUser.java
+++ b/java/org/apache/catalina/users/GenericUser.java
@@ -197,7 +197,7 @@ public class GenericUser<UD extends UserDatabase> extends
AbstractUser {
if (obj instanceof GenericUser) {
GenericUser<?> user = (GenericUser<?>) obj;
return user.database == database &&
- ((username == null && user.getUsername() == null) ||
username.equals(user.getUsername()));
+ ((username == null && user.getUsername() == null) ||
(username != null && username.equals(user.getUsername())));
}
return super.equals(obj);
}
diff --git a/java/org/apache/catalina/users/MemoryUserDatabaseFactory.java
b/java/org/apache/catalina/users/MemoryUserDatabaseFactory.java
index f18306c536..bed97e3e91 100644
--- a/java/org/apache/catalina/users/MemoryUserDatabaseFactory.java
+++ b/java/org/apache/catalina/users/MemoryUserDatabaseFactory.java
@@ -92,12 +92,12 @@ public class MemoryUserDatabaseFactory implements
ObjectFactory {
}
ra = ref.get("readonly");
- if (ra != null) {
+ if (ra != null && ra.getContent() != null) {
database.setReadonly(Boolean.parseBoolean(ra.getContent().toString()));
}
ra = ref.get("watchSource");
- if (ra != null) {
+ if (ra != null && ra.getContent() != null) {
database.setWatchSource(Boolean.parseBoolean(ra.getContent().toString()));
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
