Repository: ignite Updated Branches: refs/heads/master 2bf085e87 -> a16eb0b0d
IGNITE-10659 Fixed deadlock when binary metadata is requested for toString() - Fixes #5652. Signed-off-by: Alexey Goncharuk <alexey.goncha...@gmail.com> Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a16eb0b0 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a16eb0b0 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a16eb0b0 Branch: refs/heads/master Commit: a16eb0b0d418b8a5ec0df644cbe4cb744eafbbb9 Parents: 2bf085e Author: Sergey Kosarev <skosa...@gridgain.com> Authored: Thu Dec 13 15:53:56 2018 +0300 Committer: Alexey Goncharuk <alexey.goncha...@gmail.com> Committed: Thu Dec 13 15:53:56 2018 +0300 ---------------------------------------------------------------------- .../processors/cache/binary/CacheObjectBinaryProcessorImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/a16eb0b0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java index 3250636..8dcc510 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java @@ -574,7 +574,7 @@ public class CacheObjectBinaryProcessorImpl extends IgniteCacheObjectProcessorIm } if (holder != null) { - if (curThread instanceof IgniteDiscoveryThread) + if (curThread instanceof IgniteDiscoveryThread || (curThread != null && curThread.isForbiddenToRequestBinaryMetadata())) return holder.metadata(); if (holder.pendingVersion() - holder.acceptedVersion() > 0) {
