Repository: ignite Updated Branches: refs/heads/ignite-6181-2 c76c973f5 -> f656ba185
ignite-6181 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f656ba18 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f656ba18 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f656ba18 Branch: refs/heads/ignite-6181-2 Commit: f656ba1852b0d0cb17fd6bf5fdf4ebfc3045b6c8 Parents: c76c973 Author: sboikov <sboi...@gridgain.com> Authored: Wed Sep 20 16:23:57 2017 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Wed Sep 20 16:23:57 2017 +0300 ---------------------------------------------------------------------- .../internal/processors/cache/GridCacheAdapter.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/f656ba18/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java index 08d5bff..32b1b99 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java @@ -4204,7 +4204,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V try { return tFut.get(); } - catch (IgniteTxRollbackCheckedException e) { + catch (IgniteTxRollbackCheckedException | NodeStoppingException e) { throw e; } catch (IgniteCheckedException e1) { @@ -4212,7 +4212,8 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V tx0.rollbackNearTxLocalAsync(); } catch (Throwable e2) { - e1.addSuppressed(e2); + if (e1 != e2) + e1.addSuppressed(e2); } throw e1; @@ -4243,7 +4244,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V try { return tFut.get(); } - catch (IgniteTxRollbackCheckedException e) { + catch (IgniteTxRollbackCheckedException | NodeStoppingException e) { throw e; } catch (IgniteCheckedException e1) { @@ -4251,7 +4252,8 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V tx0.rollbackNearTxLocalAsync(); } catch (Throwable e2) { - e1.addSuppressed(e2); + if (e2 != e1) + e1.addSuppressed(e2); } throw e1;
