This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new 8a5946414e Default to Object for type, just in case
8a5946414e is described below
commit 8a5946414e8d39716f9348b4650a02373abf3d21
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 f1636aff3a..d11885f65b 100644
--- a/java/org/apache/catalina/startup/WebAnnotationSet.java
+++ b/java/org/apache/catalina/startup/WebAnnotationSet.java
@@ -424,6 +424,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]
