You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ip...@apache.org on 2020/01/09 11:53:17 UTC

[ignite] branch master updated: IGNITE-12515 Fixed flaky GridMultinodeRedeploySharedModeSelfTest.testSharedMode - Fixes #7220.

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

ipavlukhin 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 99e037c  IGNITE-12515 Fixed flaky GridMultinodeRedeploySharedModeSelfTest.testSharedMode - Fixes #7220.
99e037c is described below

commit 99e037c6cb548ff8c8f00418d1f692449832e82f
Author: ibessonov <be...@gmail.com>
AuthorDate: Thu Jan 9 14:51:58 2020 +0300

    IGNITE-12515 Fixed flaky GridMultinodeRedeploySharedModeSelfTest.testSharedMode - Fixes #7220.
    
    Signed-off-by: ipavlukhin <vo...@gmail.com>
---
 .../deployment/GridDeploymentPerVersionStore.java        | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerVersionStore.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerVersionStore.java
index abd17a3..f317024 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerVersionStore.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerVersionStore.java
@@ -280,18 +280,16 @@ public class GridDeploymentPerVersionStore extends GridDeploymentStoreAdapter {
 
     /** {@inheritDoc} */
     @Override public GridDeployment searchDeploymentCache(GridDeploymentMetadata meta) {
-        List<SharedDeployment> deps = null;
-
         synchronized (mux) {
-            deps = cache.get(meta.userVersion());
-        }
+            List<SharedDeployment> deps = cache.get(meta.userVersion());
 
-        if (deps != null) {
-            assert !deps.isEmpty();
+            if (deps != null) {
+                assert !deps.isEmpty();
 
-            for (SharedDeployment d : deps) {
-                if (d.hasParticipant(meta.senderNodeId(), meta.classLoaderId()))
-                    return d;
+                for (SharedDeployment d : deps) {
+                    if (d.hasParticipant(meta.senderNodeId(), meta.classLoaderId()))
+                        return d;
+                }
             }
         }