[ignite] 09/30: WIP

[av]

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

av pushed a commit to branch ignite-20177
in repository https://gitbox.apache.org/repos/asf/ignite.git

commit f0efc7411ddeca4f0cbf9d639e3c36e67e47699d
Author: Anton Vinogradov <a...@apache.org>
AuthorDate: Mon Aug 7 22:59:15 2023 +0300

    WIP
---
 .../distributed/dht/colocated/GridDhtColocatedLockFuture.java      | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java
index 37d55334828..d3f13813581 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java
@@ -125,7 +125,7 @@ public final class GridDhtColocatedLockFuture extends 
GridCacheCompoundIdentityF
 
     /** Keys to lock. */
     @GridToStringInclude
-    private Collection<KeyCacheObject> keys;
+    private final Collection<KeyCacheObject> keys;
 
     /** Future ID. */
     private final IgniteUuid futId;
@@ -1213,7 +1213,7 @@ public final class GridDhtColocatedLockFuture extends 
GridCacheCompoundIdentityF
 
         // Fail fast if the transaction is timed out.
         if (tx != null && tx.remainingTime() == -1) {
-            GridDhtColocatedLockFuture.this.onDone(false, 
tx.timeoutException());
+            onDone(false, tx.timeoutException());
 
             clear();
 
@@ -1292,8 +1292,7 @@ public final class GridDhtColocatedLockFuture extends 
GridCacheCompoundIdentityF
         add(new GridEmbeddedFuture<>(
             new C2<Exception, Exception, Boolean>() {
                 @Override public Boolean apply(Exception resEx, Exception e) {
-                    if (CU.isLockTimeoutOrCancelled(e) ||
-                        (resEx != null && CU.isLockTimeoutOrCancelled(resEx)))
+                    if (CU.isLockTimeoutOrCancelled(e) || 
(CU.isLockTimeoutOrCancelled(resEx)))
                         return false;
 
                     if (e != null) {