[GitHub] ingvard commented on a change in pull request #6072: IGNITE-11276: Solve NPE problem, uses exchCtx from parent if state is…

[GitBox <gi...@apache.org>]

ingvard commented on a change in pull request #6072: IGNITE-11276: Solve NPE problem, uses exchCtx from parent if state is…
URL: https://github.com/apache/ignite/pull/6072#discussion_r255422550
 
 

 ##########
 File path: modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
 ##########
 @@ -475,7 +475,12 @@ public void affinityChangeMessage(CacheAffinityChangeMessage affChangeMsg) {
          */
         assert exchangeDone() : "Should not be called before exchange is finished";
 
-        return isDone() ? result() : exchCtx.events().topologyVersion();
+        if (isDone())
+            return result();
+
+        ExchangeContext exchCtx0 = state == ExchangeLocalState.MERGED ? mergedWith.exchCtx : exchCtx;
 
 Review comment:
   I see. I fixed it.

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services