ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From agoncha...@apache.org
Subject ignite git commit: IGNITE-5806 - Fixed assertion with a side-effect - Fixes #2335.
Date Wed, 26 Jul 2017 14:23:25 GMT
Repository: ignite
Updated Branches:
  refs/heads/master e96225f1e -> 9e79c4b69


IGNITE-5806 - Fixed assertion with a side-effect - Fixes #2335.

Signed-off-by: Alexey Goncharuk <alexey.goncharuk@gmail.com>


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9e79c4b6
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9e79c4b6
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9e79c4b6

Branch: refs/heads/master
Commit: 9e79c4b69da2e553d845edcfa5d61717a8ebb5f0
Parents: e96225f
Author: dpavlov <dpavlov@gridgain.com>
Authored: Wed Jul 26 17:23:05 2017 +0300
Committer: Alexey Goncharuk <alexey.goncharuk@gmail.com>
Committed: Wed Jul 26 17:23:05 2017 +0300

----------------------------------------------------------------------
 .../processors/cache/store/GridCacheStoreManagerAdapter.java    | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/9e79c4b6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/GridCacheStoreManagerAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/GridCacheStoreManagerAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/GridCacheStoreManagerAdapter.java
index 99541ba..9cba3dd 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/GridCacheStoreManagerAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/GridCacheStoreManagerAdapter.java
@@ -875,9 +875,8 @@ public abstract class GridCacheStoreManagerAdapter extends GridCacheManagerAdapt
                         lsnr.onSessionEnd(locSes, !threwEx);
                 }
 
-                assert !sesHolder.get().ended(store);
-
-                store.sessionEnd(!threwEx);
+                if (!sesHolder.get().ended(store))
+                    store.sessionEnd(!threwEx);
             }
         }
         catch (Exception e) {


Mime
View raw message