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

nizhikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git


The following commit(s) were added to refs/heads/master by this push:
     new 928d212d153 [MINOR] Simplify BinaryUtils.resolveClass logic (#13646)
928d212d153 is described below

commit 928d212d153f0c54a40bb783caa6728bfb4f8fee
Author: Nikolay <[email protected]>
AuthorDate: Mon Oct 5 10:42:06 2026 +0300

    [MINOR] Simplify BinaryUtils.resolveClass logic (#13646)
---
 .../src/main/java/org/apache/ignite/internal/binary/BinaryArray.java  | 4 +---
 .../src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java  | 3 +++
 .../java/org/apache/ignite/internal/binary/BinaryEnumObjectImpl.java  | 4 +---
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git 
a/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/BinaryArray.java
 
b/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/BinaryArray.java
index dc8bc639b74..b998a31d0cd 100644
--- 
a/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/BinaryArray.java
+++ 
b/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/BinaryArray.java
@@ -104,13 +104,11 @@ class BinaryArray implements BinaryObjectEx, 
Externalizable, Comparable<BinaryAr
 
     /** {@inheritDoc} */
     @Override public <T> T deserialize(ClassLoader ldr) throws 
BinaryObjectException {
-        ClassLoader resolveLdr = ldr == null ? ctx.classLoader() : ldr;
-
         if (ldr != null)
             Marshallers.USE_CACHE.set(Boolean.FALSE);
 
         try {
-            Class<?> compType = BinaryUtils.resolveClass(ctx, compTypeId, 
compClsName, resolveLdr, false);
+            Class<?> compType = BinaryUtils.resolveClass(ctx, compTypeId, 
compClsName, ldr, false);
 
             // Skip deserialization if already deserialized.
             // Prepared result is in arr, already.
diff --git 
a/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java
 
b/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java
index 2fceaa4d431..274d8addced 100644
--- 
a/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java
+++ 
b/modules/binary/api/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java
@@ -1234,6 +1234,9 @@ public class BinaryUtils {
         @Nullable ClassLoader ldr, boolean registerMeta) {
         Class cls;
 
+        if (ldr == null)
+            ldr = ctx.classLoader();
+
         if (typeId != GridBinaryMarshaller.UNREGISTERED_TYPE_ID)
             cls = ctx.descriptorForTypeId(true, typeId, ldr, 
registerMeta).describedClass();
         else {
diff --git 
a/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/BinaryEnumObjectImpl.java
 
b/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/BinaryEnumObjectImpl.java
index 2024eef66e5..1daea71a44a 100644
--- 
a/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/BinaryEnumObjectImpl.java
+++ 
b/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/BinaryEnumObjectImpl.java
@@ -169,13 +169,11 @@ class BinaryEnumObjectImpl implements BinaryObjectEx, 
Externalizable, CacheObjec
 
     /** {@inheritDoc} */
     @Override public <T> T deserialize(@Nullable ClassLoader ldr) throws 
BinaryObjectException {
-        ClassLoader resolveLdr = ldr == null ? ctx.classLoader() : ldr;
-
         if (ldr != null)
             Marshallers.USE_CACHE.set(Boolean.FALSE);
 
         try {
-            Class cls = BinaryUtils.resolveClass(ctx, typeId, clsName, 
resolveLdr, false);
+            Class cls = BinaryUtils.resolveClass(ctx, typeId, clsName, ldr, 
false);
 
             return (T)(ldr == null ? BinaryEnumCache.get(cls, ord) : 
uncachedValue(cls));
         }

Reply via email to