ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [09/28] incubator-ignite git commit: ignite-930 - log
Date Wed, 27 May 2015 15:07:42 GMT
ignite-930 - log


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

Branch: refs/heads/ignite-709_2
Commit: 6aa16b850f6f2a6179a264c0931df84c895f12dc
Parents: 1c8d7c9
Author: S.Vladykin <svladykin@gridgain.com>
Authored: Fri May 22 08:56:00 2015 +0300
Committer: S.Vladykin <svladykin@gridgain.com>
Committed: Fri May 22 08:56:00 2015 +0300

----------------------------------------------------------------------
 .../cache/distributed/GridDistributedTxRemoteAdapter.java | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6aa16b85/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java
index 3215138..ad9b21d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java
@@ -651,15 +651,17 @@ public class GridDistributedTxRemoteAdapter extends IgniteTxAdapter
                             }
                         }
                         catch (Throwable ex) {
-                            uncommit();
-
-                            state(UNKNOWN);
-
                             // In case of error, we still make the best effort to commit,
                             // as there is no way to rollback at this point.
                             err = new IgniteTxHeuristicCheckedException("Commit produced
a runtime exception " +
                                 "(all transaction entries will be invalidated): " + CU.txString(this),
ex);
 
+                            U.error(log, "Commit failed.", err);
+
+                            uncommit();
+
+                            state(UNKNOWN);
+
                             if (ex instanceof Error)
                                 throw (Error)ex;
                         }


Mime
View raw message