Repository: ignite Updated Branches: refs/heads/ignite-1537 656b113ed -> 00790c8c3
ignite-1.5 Fixed hang on metadata update inside put in atomic cache when topology read lock is held. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/00790c8c Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/00790c8c Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/00790c8c Branch: refs/heads/ignite-1537 Commit: 00790c8c3870ed37519dc35d0e1cce01b08ea8d5 Parents: 656b113 Author: sboikov <[email protected]> Authored: Wed Dec 23 10:21:05 2015 +0300 Committer: sboikov <[email protected]> Committed: Wed Dec 23 10:21:05 2015 +0300 ---------------------------------------------------------------------- .../internal/processors/cache/transactions/IgniteTxManager.java | 2 +- .../org/apache/ignite/cache/websession/WebSessionListener.java | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/00790c8c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java index 6cad462..8ff3b8b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java @@ -114,7 +114,7 @@ public class IgniteTxManager extends GridCacheSharedManagerAdapter { /** Committing transactions. */ private final ThreadLocal<IgniteInternalTx> threadCtx = new ThreadLocal<>(); - /** Transaction which topology version should be used when mapping internal tx. */ + /** Topology version should be used when mapping internal tx. */ private final ThreadLocal<AffinityTopologyVersion> txTop = new ThreadLocal<>(); /** Per-thread transaction map. */ http://git-wip-us.apache.org/repos/asf/ignite/blob/00790c8c/modules/web/src/main/java/org/apache/ignite/cache/websession/WebSessionListener.java ---------------------------------------------------------------------- diff --git a/modules/web/src/main/java/org/apache/ignite/cache/websession/WebSessionListener.java b/modules/web/src/main/java/org/apache/ignite/cache/websession/WebSessionListener.java index 63f58f5..b826031 100644 --- a/modules/web/src/main/java/org/apache/ignite/cache/websession/WebSessionListener.java +++ b/modules/web/src/main/java/org/apache/ignite/cache/websession/WebSessionListener.java @@ -33,7 +33,6 @@ import org.apache.ignite.IgniteCache; import org.apache.ignite.IgniteException; import org.apache.ignite.IgniteLogger; import org.apache.ignite.cluster.ClusterTopologyException; -import org.apache.ignite.internal.IgniteInterruptedCheckedException; import org.apache.ignite.internal.util.typedef.T2; import org.apache.ignite.internal.util.typedef.X; import org.apache.ignite.internal.util.typedef.internal.S; @@ -146,7 +145,7 @@ class WebSessionListener { } } } - catch (CacheException | IgniteException | IgniteInterruptedCheckedException e) { + catch (Exception e) { U.error(log, "Failed to update session attributes [id=" + sesId + ']', e); } }
