You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by re...@apache.org on 2026/05/26 20:11:26 UTC
(tomcat) branch main updated: Add null checks
This is an automated email from the ASF dual-hosted git repository.
rmaucher 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 ff4fa494b6 Add null checks
ff4fa494b6 is described below
commit ff4fa494b6a02dccb6a3ff5e60ce454a380b997f
Author: remm <re...@apache.org>
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 912ad3f405..1d314a14e0 100644
--- a/java/org/apache/catalina/users/GenericGroup.java
+++ b/java/org/apache/catalina/users/GenericGroup.java
@@ -143,7 +143,7 @@ public class GenericGroup<UD extends UserDatabase> extends AbstractGroup {
public boolean equals(Object obj) {
if (obj instanceof GenericGroup<?> group) {
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 fdcf380d55..793c5c480a 100644
--- a/java/org/apache/catalina/users/GenericRole.java
+++ b/java/org/apache/catalina/users/GenericRole.java
@@ -86,7 +86,7 @@ public class GenericRole<UD extends UserDatabase> extends AbstractRole {
public boolean equals(Object obj) {
if (obj instanceof GenericRole<?> role) {
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 eb8b3f148a..ca3724a213 100644
--- a/java/org/apache/catalina/users/GenericUser.java
+++ b/java/org/apache/catalina/users/GenericUser.java
@@ -196,7 +196,7 @@ public class GenericUser<UD extends UserDatabase> extends AbstractUser {
public boolean equals(Object obj) {
if (obj instanceof GenericUser<?> user) {
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 da4b3ee027..07e565992e 100644
--- a/java/org/apache/catalina/users/MemoryUserDatabaseFactory.java
+++ b/java/org/apache/catalina/users/MemoryUserDatabaseFactory.java
@@ -91,12 +91,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: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org