IGNITE-18976 WIP.

apache · Mar 7, 2023 · 1929ad4 · 1929ad4
1 parent 76fc161
commit 1929ad4
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java
@@ -667,7 +667,10 @@ public void registerClassLocally(BinaryType binaryType, boolean failIfUnregister
 
             BinarySerializer serializer = serializerForClass(cls);
 
-            String affFieldName = affKeyFieldNames.getOrDefault(typeId, affinityKeyFieldName(typeId));
+            String affFieldName = affinityKeyFieldName(typeId);
+
+            if (affFieldName == null)
+                affFieldName = affinityFieldName(cls);
 
             return new BinaryClassDescriptor(this,
                 cls,