This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-jexl.git
The following commit(s) were added to refs/heads/master by this push:
new 05c6c9a2 Guard logging calls
05c6c9a2 is described below
commit 05c6c9a2630d35e58be63a5d6d515af8eac6ccfd
Author: Gary Gregory <[email protected]>
AuthorDate: Tue May 21 13:27:54 2024 -0400
Guard logging calls
---
src/changes/changes.xml | 3 +++
.../java/org/apache/commons/jexl3/internal/Engine.java | 16 ++++++++++++----
2 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 974c47e5..2213f77d 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -88,6 +88,9 @@
<action dev="ggregory" type="fix" due-to="step-security-bot, Gary
Gregory">
[StepSecurity] ci: Harden GitHub Actions #180.
</action>
+ <action dev="ggregory" type="fix" due-to="PMD, Gary Gregory">
+ Guard logging calls.
+ </action>
<!-- UPDATE -->
<action dev="henrib" type="update" due-to="dependabot">
Bump github actions.
diff --git a/src/main/java/org/apache/commons/jexl3/internal/Engine.java
b/src/main/java/org/apache/commons/jexl3/internal/Engine.java
index b5a83edd..bf468532 100644
--- a/src/main/java/org/apache/commons/jexl3/internal/Engine.java
+++ b/src/main/java/org/apache/commons/jexl3/internal/Engine.java
@@ -517,13 +517,17 @@ public class Engine extends JexlEngine {
final String nsclass = value.toString();
final Class<?> clazz = uberspect.getClassByName(nsclass);
if (clazz == null) {
- logger.warn(key + ": unable to find class " + nsclass);
+ if (logger.isWarnEnabled()) {
+ logger.warn(key + ": unable to find class " + nsclass);
+ }
} else {
ns.put(namespaceName, clazz);
}
}
} else {
- logger.warn(key + ": ambiguous declaration " + value);
+ if (logger.isWarnEnabled()) {
+ logger.warn(key + ": ambiguous declaration " + value);
+ }
}
}
@@ -543,11 +547,15 @@ public class Engine extends JexlEngine {
// jexl.module.***
final String module = key.substring(PRAGMA_MODULE.length());
if (module.isEmpty()) {
- logger.warn(module + ": invalid module declaration");
+ if (logger.isWarnEnabled()) {
+ logger.warn(module + ": invalid module declaration");
+ }
} else {
withValueSet(value, o -> {
if (!(o instanceof CharSequence)) {
- logger.warn(module + ": unable to define module from " +
value);
+ if (logger.isWarnEnabled()) {
+ logger.warn(module + ": unable to define module from "
+ value);
+ }
} else {
final String moduleSrc = o.toString();
final Object functor;