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 e2be14aa2c6 [MINOR] Remove single usage of 
CacheObjectValueContext#classLoader (#13647)
e2be14aa2c6 is described below

commit e2be14aa2c6dba256e7f992f1f0956ffa1aa6cbb
Author: Nikolay <[email protected]>
AuthorDate: Mon Oct 5 16:16:47 2026 +0300

    [MINOR] Remove single usage of CacheObjectValueContext#classLoader (#13647)
---
 .../processors/cache/CacheObjectValueContext.java      |  6 ------
 .../ignite/internal/binary/BinaryObjectImpl.java       | 18 +++++++++---------
 .../processors/cache/AbstractCacheObjectContext.java   |  6 ------
 3 files changed, 9 insertions(+), 21 deletions(-)

diff --git 
a/modules/binary/api/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectValueContext.java
 
b/modules/binary/api/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectValueContext.java
index 453e2fb795b..c3c9341e126 100644
--- 
a/modules/binary/api/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectValueContext.java
+++ 
b/modules/binary/api/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectValueContext.java
@@ -20,7 +20,6 @@ package org.apache.ignite.internal.processors.cache;
 import org.apache.ignite.IgniteCheckedException;
 import org.apache.ignite.IgniteLogger;
 import org.apache.ignite.internal.binary.BinaryContext;
-import org.jetbrains.annotations.Nullable;
 
 /**
  * Context to get value of cache object.
@@ -60,11 +59,6 @@ public interface CacheObjectValueContext {
      */
     public void waitMetadataWriteIfNeeded(final int typeId);
 
-    /**
-     * @return User's class loader.
-     */
-    public @Nullable ClassLoader classLoader();
-
     /**
      * Gets distributed class loader.
      *
diff --git 
a/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/BinaryObjectImpl.java
 
b/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/BinaryObjectImpl.java
index 4f625babc37..3359c73459d 100644
--- 
a/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/BinaryObjectImpl.java
+++ 
b/modules/binary/impl/src/main/java/org/apache/ignite/internal/binary/BinaryObjectImpl.java
@@ -185,8 +185,12 @@ public final class BinaryObjectImpl extends 
BinaryObjectExImpl implements Extern
         if (obj0 == null || (cpy && needCopy(ctx))) {
             if (ldr != null)
                 obj0 = deserialize(ldr);
-            else
-                obj0 = deserializeValue(ctx);
+            else {
+                obj0 = deserializeValue();
+
+                if (ctx != null && ctx.storeValue())
+                    obj = obj0;
+            }
         }
 
         return (T)obj0;
@@ -715,7 +719,7 @@ public final class BinaryObjectImpl extends 
BinaryObjectExImpl implements Extern
         Object obj0 = obj;
 
         if (obj0 == null)
-            obj0 = deserializeValue(null);
+            obj0 = deserializeValue();
 
         return (T)obj0;
     }
@@ -777,11 +781,10 @@ public final class BinaryObjectImpl extends 
BinaryObjectExImpl implements Extern
     /**
      * Runs value deserialization regardless of whether obj already has the 
deserialized value.
      * Will set obj if descriptor is configured to keep deserialized values.
-     * @param coCtx CacheObjectContext.
      * @return Object.
      */
-    private Object deserializeValue(@Nullable CacheObjectValueContext coCtx) {
-        BinaryReaderExImpl reader = reader(null, coCtx != null ? 
coCtx.classLoader() : ctx.classLoader(), true);
+    private Object deserializeValue() {
+        BinaryReaderExImpl reader = reader(null, ctx.classLoader(), true);
 
         Object obj0 = reader.deserialize();
 
@@ -789,9 +792,6 @@ public final class BinaryObjectImpl extends 
BinaryObjectExImpl implements Extern
 
         assert desc != null;
 
-        if (coCtx != null && coCtx.storeValue())
-            obj = obj0;
-
         return obj0;
     }
 
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/AbstractCacheObjectContext.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/AbstractCacheObjectContext.java
index 49dee74e82e..720d834a740 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/AbstractCacheObjectContext.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/AbstractCacheObjectContext.java
@@ -25,7 +25,6 @@ import org.apache.ignite.internal.GridKernalContext;
 import org.apache.ignite.internal.binary.BinaryContext;
 import 
org.apache.ignite.internal.cache.transform.CacheObjectTransformerProcessor;
 import org.apache.ignite.internal.util.GridUnsafe;
-import org.jetbrains.annotations.Nullable;
 
 import static org.apache.ignite.events.EventType.EVT_CACHE_OBJECT_TRANSFORMED;
 import static 
org.apache.ignite.internal.binary.GridBinaryMarshaller.TRANSFORMED;
@@ -61,11 +60,6 @@ public abstract class AbstractCacheObjectContext implements 
CacheObjectValueCont
         ctx.cacheObjects().waitMetadataWriteIfNeeded(typeId);
     }
 
-    /** {@inheritDoc} */
-    @Override public @Nullable ClassLoader classLoader() {
-        return ctx.config().getClassLoader();
-    }
-
     /** {@inheritDoc} */
     @Override public ClassLoader globalLoader() {
         return ctx.cache().context().deploy().globalLoader();

Reply via email to