[ignite] branch master updated: IGNITE-11959 NullPointerException If transaction failed and failure handler doesn't configured explicitly

[irakov]

This is an automated email from the ASF dual-hosted git repository.

irakov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git


The following commit(s) were added to refs/heads/master by this push:
     new 3479460  IGNITE-11959 NullPointerException If transaction failed and 
failure handler doesn't configured explicitly
3479460 is described below

commit 3479460b6fcf8a77c487d14e15f044aa2cbffef7
Author: Kirill Tkalenko <tkalkir...@yandex.ru>
AuthorDate: Fri Jul 5 16:37:01 2019 +0300

    IGNITE-11959 NullPointerException If transaction failed and failure handler 
doesn't configured explicitly
    
    Signed-off-by: Ivan Rakov <ira...@apache.org>
---
 .../internal/processors/cache/transactions/IgniteTxAdapter.java   | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

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 131bd72..11eac79 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
@@ -808,18 +808,16 @@ public abstract class IgniteTxAdapter extends 
GridMetadataAwareAdapter implement
     public void logTxFinishErrorSafe(@Nullable IgniteLogger log, boolean 
commit, Throwable e) {
         assert e != null : "Exception is expected";
 
-        final String fmt = "Failed completing the transaction: [commit=%s, 
tx=%s, plc=%s]";
+        final String fmt = "Failed completing the transaction: [commit=%s, 
tx=%s]";
 
         try {
             // First try printing a full transaction. This is error prone.
-            U.error(log, String.format(fmt, commit, this,
-                
cctx.gridConfig().getFailureHandler().getClass().getSimpleName()), e);
+            U.error(log, String.format(fmt, commit, this), e);
         }
         catch (Throwable e0) {
             e.addSuppressed(e0);
 
-            U.error(log, String.format(fmt, commit, CU.txString(this),
-                
cctx.gridConfig().getFailureHandler().getClass().getSimpleName()), e);
+            U.error(log, String.format(fmt, commit, CU.txString(this)), e);
         }
     }