(commons-jexl) branch master updated: JEXL-455: changes, release notes;

[henrib]

This is an automated email from the ASF dual-hosted git repository.

henrib 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 ffe67892 JEXL-455: changes, release notes;
ffe67892 is described below

commit ffe6789229b909e1dc26e341c3c5b606312164d3
Author: Henrib <hbies...@gmail.com>
AuthorDate: Thu Feb 5 15:17:25 2026 +0100

    JEXL-455: changes, release notes;
---
 RELEASE-NOTES.txt                                                    | 1 +
 src/changes/changes.xml                                              | 1 +
 .../apache/commons/jexl3/internal/introspection/Introspector.java    | 5 ++---
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index 4551ea00..3e33c07b 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -44,6 +44,7 @@ Version 3.6.2 is source and binary compatible with 3.6.
 
 Bugs Fixed in 3.6.2:
 ====================
+* JEXL-455:     Tokenization error with multiline expressions.
 * JEXL-454:     Switch NaN case not found.
 * JEXL-453:     Finally clause is not evaluated.
 
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index fc00a037..4954465f 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -30,6 +30,7 @@
         <release version="3.6.2" date="YYYY-MM-DD"
                  description="This is a feature and maintenance release. Java 
8 or later is required.">
             <!-- FIX -->
+            <action dev="henrib" type="fix" issue="JEXL-455" due-to="Vincent 
Bussol">Tokenization error with multiline expressions.</action>
             <action dev="henrib" type="fix" issue="JEXL-454" due-to="Vincent 
Bussol">Switch NaN case not found.</action>
             <action dev="henrib" type="fix" issue="JEXL-453" due-to="Vincent 
Bussol">Finally clause is not evaluated.</action>
             <!-- ADD -->
diff --git 
a/src/main/java/org/apache/commons/jexl3/internal/introspection/Introspector.java
 
b/src/main/java/org/apache/commons/jexl3/internal/introspection/Introspector.java
index ec2c98b1..cdcf9cfb 100644
--- 
a/src/main/java/org/apache/commons/jexl3/internal/introspection/Introspector.java
+++ 
b/src/main/java/org/apache/commons/jexl3/internal/introspection/Introspector.java
@@ -24,7 +24,6 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 import java.util.concurrent.locks.ReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
@@ -140,7 +139,7 @@ public final class Introspector {
      */
     public Introspector(final Log log, final ClassLoader loader, final 
JexlPermissions perms) {
         this.logger = log;
-        this.loader = loader;
+        this.loader = loader != null ? loader : 
JexlUberspect.class.getClassLoader();
         this.permissions = perms == null ? JexlPermissions.RESTRICTED : perms;
     }
 
@@ -152,7 +151,7 @@ public final class Introspector {
      */
     public Class<?> getClassByName(final String className) {
         try {
-            final ClassLoader classLoader = Objects.requireNonNull(loader, 
"class loader should not be null");
+            final ClassLoader classLoader = loader;
             final Class<?> clazz = Class.forName(className, false, 
classLoader);
             return permissions.allow(clazz)? clazz : null;
         } catch (final ClassNotFoundException xignore) {