You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sd...@apache.org on 2022/03/03 15:46:27 UTC

[ignite-3] 05/07: .

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

sdanilov pushed a commit to branch ignite-16393
in repository https://gitbox.apache.org/repos/asf/ignite-3.git

commit a5e8c16f3cbc26670c3cee028cd3b893ec713c24
Author: Semyon Danilov <sa...@yandex.ru>
AuthorDate: Thu Mar 3 15:55:43 2022 +0300

    .
---
 .../internal/network/processor/messages/MessageImplGenerator.java    | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/modules/network-annotation-processor/src/main/java/org/apache/ignite/internal/network/processor/messages/MessageImplGenerator.java b/modules/network-annotation-processor/src/main/java/org/apache/ignite/internal/network/processor/messages/MessageImplGenerator.java
index c76b227..701ba1e 100644
--- a/modules/network-annotation-processor/src/main/java/org/apache/ignite/internal/network/processor/messages/MessageImplGenerator.java
+++ b/modules/network-annotation-processor/src/main/java/org/apache/ignite/internal/network/processor/messages/MessageImplGenerator.java
@@ -218,9 +218,9 @@ public class MessageImplGenerator {
                 return Type.COLLECTION;
             } else if (typeUtils.isSameType(parameterType, Map.class)) {
                 return Type.MAP;
+            } else if (typeUtils.isSubType(parameterType, NetworkMessage.class)) {
+                return Type.MESSAGE;
             }
-        } else if (typeUtils.isSubType(parameterType, NetworkMessage.class)) {
-            return Type.MESSAGE;
         }
         return null;
     }
@@ -249,7 +249,6 @@ public class MessageImplGenerator {
                 String baName = objectName + "ByteArray";
                 String moName = baName + "mo";
                 beforeRead.addStatement("$T $N = marshaller.marshal($N)", marshalledObjectClass, moName, objectName);
-                beforeRead.addStatement("$N = null", objectName);
                 beforeRead.addStatement("set.addAll($N.usedDescriptorIds())", moName);
                 beforeRead.addStatement("$N = $N.bytes()", baName, moName).addCode("\n");
             } else {