This is an automated email from the ASF dual-hosted git repository.
markt 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 eb9a3edbce Fix NPE warnings
eb9a3edbce is described below
commit eb9a3edbce9e7f15026c32d97bf5602e1273532e
Author: Mark Thomas <[email protected]>
AuthorDate: Wed Jan 4 15:37:59 2023 +0000
Fix NPE warnings
desc cannot be null here (based on review of calling methods)
---
java/org/apache/catalina/storeconfig/ConnectorStoreAppender.java | 8 ++++----
java/org/apache/catalina/storeconfig/StoreAppender.java | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/java/org/apache/catalina/storeconfig/ConnectorStoreAppender.java
b/java/org/apache/catalina/storeconfig/ConnectorStoreAppender.java
index 6de623bf6c..825fde4987 100644
--- a/java/org/apache/catalina/storeconfig/ConnectorStoreAppender.java
+++ b/java/org/apache/catalina/storeconfig/ConnectorStoreAppender.java
@@ -63,7 +63,7 @@ public class ConnectorStoreAppender extends StoreAppender {
throws Exception {
// Render a className attribute if requested
- if (include && desc != null && !desc.isStandard()) {
+ if (include && !desc.isStandard()) {
writer.print(" className=\"");
writer.print(bean.getClass().getName());
writer.print("\"");
@@ -105,11 +105,11 @@ public class ConnectorStoreAppender extends StoreAppender
{
*
* @param bean The connector
* @return List of Connector property names
- * @throws IntrospectionException Error intropecting connector
+ * @throws IntrospectionException Error introspecting connector
*/
protected List<String> getPropertyKeys(Connector bean)
throws IntrospectionException {
- ArrayList<String> propertyKeys = new ArrayList<>();
+ List<String> propertyKeys = new ArrayList<>();
// Acquire the list of properties for this bean
ProtocolHandler protocolHandler = bean.getProtocolHandler();
// Acquire the list of properties for this bean
@@ -300,4 +300,4 @@ public class ConnectorStoreAppender extends StoreAppender {
return jkHomeBase;
}
-}
\ No newline at end of file
+}
diff --git a/java/org/apache/catalina/storeconfig/StoreAppender.java
b/java/org/apache/catalina/storeconfig/StoreAppender.java
index 175cfb1f96..bdb6b23e86 100644
--- a/java/org/apache/catalina/storeconfig/StoreAppender.java
+++ b/java/org/apache/catalina/storeconfig/StoreAppender.java
@@ -216,7 +216,7 @@ public class StoreAppender {
throws Exception {
// Render a className attribute if requested
- if (include && desc != null && !desc.isStandard()) {
+ if (include && !desc.isStandard()) {
writer.print(" className=\"");
writer.print(bean.getClass().getName());
writer.print("\"");
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
