Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D3FAA18F22 for ; Tue, 29 Dec 2015 06:57:08 +0000 (UTC) Received: (qmail 25700 invoked by uid 500); 29 Dec 2015 06:57:08 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 25662 invoked by uid 500); 29 Dec 2015 06:57:08 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 25653 invoked by uid 99); 29 Dec 2015 06:57:08 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 29 Dec 2015 06:57:08 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 864C3DFBEE; Tue, 29 Dec 2015 06:57:08 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.apache.org Message-Id: <9ac16986ec61495aaa921c6c56010160@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: ignite git commit: ignite-1.5 debug Date: Tue, 29 Dec 2015 06:57:08 +0000 (UTC) Repository: ignite Updated Branches: refs/heads/ignite-1537 cf4007e22 -> b1b93d077 ignite-1.5 debug Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b1b93d07 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b1b93d07 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b1b93d07 Branch: refs/heads/ignite-1537 Commit: b1b93d077d387f43692828bbda096dc78133feed Parents: cf4007e Author: sboikov Authored: Tue Dec 29 09:57:00 2015 +0300 Committer: sboikov Committed: Tue Dec 29 09:57:00 2015 +0300 ---------------------------------------------------------------------- .../internal/processors/cache/transactions/IgniteTxAdapter.java | 3 +++ 1 file changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/b1b93d07/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java index afcec88..66434d0 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java @@ -1097,6 +1097,9 @@ public abstract class IgniteTxAdapter extends GridMetadataAwareAdapter } case MARKED_ROLLBACK: { + if (prev == COMMITTING) + System.exit(99); + valid = prev == ACTIVE || prev == PREPARING || prev == PREPARED; break;