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 bde91d43f2 Default to Object for type, just in case
bde91d43f2 is described below
commit bde91d43f27e571f6065c9fbd1f4f126c6fd298f
Author: remm <[email protected]>
AuthorDate: Thu Sep 14 11:14:45 2023 +0200
Default to Object for type, just in case
Found by coverity.
---
java/org/apache/catalina/startup/WebAnnotationSet.java | 2 ++
1 file changed, 2 insertions(+)
diff --git a/java/org/apache/catalina/startup/WebAnnotationSet.java
b/java/org/apache/catalina/startup/WebAnnotationSet.java
index e6459094c0..04ddb7c196 100644
--- a/java/org/apache/catalina/startup/WebAnnotationSet.java
+++ b/java/org/apache/catalina/startup/WebAnnotationSet.java
@@ -427,6 +427,8 @@ public class WebAnnotationSet {
if (type == null || type.equals(Object.class)) {
if (defaultType != null) {
type = defaultType;
+ } else {
+ type = Object.class;
}
}
return Introspection.convertPrimitiveType(type).getCanonicalName();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
