You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by al...@apache.org on 2024/02/02 07:13:24 UTC
(ignite) branch master updated: IGNITE-21351 Fix NPE on metric "TransactionsHoldingLockNumber" if tx is not initialized (#11197)
This is an automated email from the ASF dual-hosted git repository.
alexpl 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 dbf53205ee7 IGNITE-21351 Fix NPE on metric "TransactionsHoldingLockNumber" if tx is not initialized (#11197)
dbf53205ee7 is described below
commit dbf53205ee73b8790000d707858188f43bbe2316
Author: Aleksey Plekhanov <Pl...@gmail.com>
AuthorDate: Fri Feb 2 10:13:17 2024 +0300
IGNITE-21351 Fix NPE on metric "TransactionsHoldingLockNumber" if tx is not initialized (#11197)
---
.../internal/processors/cache/transactions/IgniteTxStateImpl.java | 2 +-
.../test/java/org/apache/ignite/internal/TransactionMetricsTest.java | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxStateImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxStateImpl.java
index e5dbfebe84a..c049bd0f57d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxStateImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxStateImpl.java
@@ -445,7 +445,7 @@ public class IgniteTxStateImpl extends IgniteTxLocalStateAdapter {
/** {@inheritDoc} */
@Override public boolean empty() {
- return txMap.isEmpty();
+ return F.isEmpty(txMap);
}
/** {@inheritDoc} */
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/TransactionMetricsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/TransactionMetricsTest.java
index c655929f7bb..1eb675ad9e2 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/TransactionMetricsTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/TransactionMetricsTest.java
@@ -107,6 +107,8 @@ public class TransactionMetricsTest extends GridCommonAbstractTest {
//when: transaction is opening
final Transaction tx1 = ignite.transactions().txStart(PESSIMISTIC, REPEATABLE_READ);
+ assertEquals(0, txMXBean.getTransactionsHoldingLockNumber());
+
int localKeysNum = 0;
for (int i = 0; i < keysNumber; i++) {