From 2133af1607424b24c3907dcf1efcdf7fefd935d2 Mon Sep 17 00:00:00 2001 From: Dmitiry Setrakyan Date: Thu, 5 Feb 2015 19:16:10 -0800 Subject: [PATCH] sprint-1 - Renamed TransactionsConfiguration to TransactionConfiguration. --- .../java/org/apache/ignite/IgniteCheckedException.java | 3 ++- .../src/main/java/org/apache/ignite/IgniteException.java | 3 ++- .../apache/ignite/configuration/IgniteConfiguration.java | 6 +++--- ...nsConfiguration.java => TransactionConfiguration.java} | 6 +++--- .../main/java/org/apache/ignite/internal/IgnitionEx.java | 2 +- .../internal/processors/cache/GridCacheAdapter.java | 6 +++--- .../internal/processors/cache/GridCacheProcessor.java | 4 ++-- .../internal/processors/cache/GridCacheSharedContext.java | 2 +- .../cache/transactions/IgniteTransactionsImpl.java | 8 ++++---- .../org/apache/ignite/messaging/MessagingListenActor.java | 2 +- .../cache/GridCacheAbstractProjectionSelfTest.java | 2 +- ...idCacheAbstractPartitionedByteArrayValuesSelfTest.java | 2 +- .../distributed/GridCacheTransformEventSelfTest.java | 2 +- .../near/GridCachePartitionedTxTimeoutSelfTest.java | 2 +- .../GridCacheReplicatedTxMultiThreadedSelfTest.java | 2 +- .../eviction/GridCacheDistributedEvictionsSelfTest.java | 2 +- .../eviction/GridCacheEmptyEntriesAbstractSelfTest.java | 2 +- .../cache/eviction/GridCacheEvictionTouchSelfTest.java | 2 +- .../near/GridCachePartitionedHitsAndMissesSelfTest.java | 2 +- .../internal/processors/cache/jta/CacheJtaManager.java | 2 +- .../main/java/org/apache/ignite/yardstick/IgniteNode.java | 2 +- 21 files changed, 33 insertions(+), 31 deletions(-) rename modules/core/src/main/java/org/apache/ignite/configuration/{TransactionsConfiguration.java => TransactionConfiguration.java} (97%) diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteCheckedException.java b/modules/core/src/main/java/org/apache/ignite/IgniteCheckedException.java index 79c116f3d12cc..2f0696c51d9a7 100644 --- a/modules/core/src/main/java/org/apache/ignite/IgniteCheckedException.java +++ b/modules/core/src/main/java/org/apache/ignite/IgniteCheckedException.java @@ -71,7 +71,8 @@ public IgniteCheckedException(String msg, @Nullable Throwable cause) { * @return {@code True} if one of the causing exception is an instance of passed in classes, * {@code false} otherwise. */ - public boolean hasCause(@Nullable Class... cls) { + @SafeVarargs + public final boolean hasCause(@Nullable Class... cls) { return X.hasCause(this, cls); } diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteException.java b/modules/core/src/main/java/org/apache/ignite/IgniteException.java index 5c82f8e3fdb67..a8ec279ca37be 100644 --- a/modules/core/src/main/java/org/apache/ignite/IgniteException.java +++ b/modules/core/src/main/java/org/apache/ignite/IgniteException.java @@ -71,7 +71,8 @@ public IgniteException(String msg, @Nullable Throwable cause) { * @return {@code True} if one of the causing exception is an instance of passed in classes, * {@code false} otherwise. */ - public boolean hasCause(@Nullable Class... cls) { + @SafeVarargs + public final boolean hasCause(@Nullable Class... cls) { return X.hasCause(this, cls); } diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java index 2198710c4702c..253d4f5bbdd3e 100644 --- a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java @@ -383,7 +383,7 @@ public class IgniteConfiguration { private CacheConfiguration[] cacheCfg; /** Transactions configuration. */ - private TransactionsConfiguration txCfg = new TransactionsConfiguration(); + private TransactionConfiguration txCfg = new TransactionConfiguration(); /** */ private Collection pluginCfgs; @@ -3117,7 +3117,7 @@ public void setWarmupClosure(IgniteInClosure warmupClos) { * * @return Transactions configuration. */ - public TransactionsConfiguration getTransactionsConfiguration() { + public TransactionConfiguration getTransactionsConfiguration() { return txCfg; } @@ -3126,7 +3126,7 @@ public TransactionsConfiguration getTransactionsConfiguration() { * * @param txCfg Transactions configuration. */ - public void setTransactionsConfiguration(TransactionsConfiguration txCfg) { + public void setTransactionsConfiguration(TransactionConfiguration txCfg) { this.txCfg = txCfg; } diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/TransactionsConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/TransactionConfiguration.java similarity index 97% rename from modules/core/src/main/java/org/apache/ignite/configuration/TransactionsConfiguration.java rename to modules/core/src/main/java/org/apache/ignite/configuration/TransactionConfiguration.java index f393fe3446ac7..ee01f3cea984d 100644 --- a/modules/core/src/main/java/org/apache/ignite/configuration/TransactionsConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/configuration/TransactionConfiguration.java @@ -24,7 +24,7 @@ /** * Transactions configuration. */ -public class TransactionsConfiguration implements Serializable { +public class TransactionConfiguration implements Serializable { /** Default value for 'txSerializableEnabled' flag. */ public static final boolean DFLT_TX_SERIALIZABLE_ENABLED = false; @@ -61,14 +61,14 @@ public class TransactionsConfiguration implements Serializable { /** * Empty constructor. */ - public TransactionsConfiguration() { + public TransactionConfiguration() { // No-op. } /** * @param cfg Configuration to copy. */ - public TransactionsConfiguration(TransactionsConfiguration cfg) { + public TransactionConfiguration(TransactionConfiguration cfg) { dfltConcurrency = cfg.getDefaultTxConcurrency(); dfltIsolation = cfg.getDefaultTxIsolation(); dfltTxTimeout = cfg.getDefaultTxTimeout(); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java index 366ea9b7e549d..05999ee2b623a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java @@ -1423,7 +1423,7 @@ private void start0(GridStartContext startCtx) throws IgniteCheckedException { myCfg.setServiceConfiguration(cfg.getServiceConfiguration()); myCfg.setWarmupClosure(cfg.getWarmupClosure()); myCfg.setPluginConfigurations(cfg.getPluginConfigurations()); - myCfg.setTransactionsConfiguration(new TransactionsConfiguration(cfg.getTransactionsConfiguration())); + myCfg.setTransactionsConfiguration(new TransactionConfiguration(cfg.getTransactionsConfiguration())); myCfg.setQueryConfiguration(cfg.getQueryConfiguration()); myCfg.setAtomicConfiguration(cfg.getAtomicConfiguration()); diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java index 3b4a44047abc0..c637bcab49905 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java @@ -3730,7 +3730,7 @@ public CacheMetricsImpl metrics0() { /** {@inheritDoc} */ @Override public IgniteTx txStart() throws IllegalStateException { - TransactionsConfiguration cfg = ctx.gridConfig().getTransactionsConfiguration(); + TransactionConfiguration cfg = ctx.gridConfig().getTransactionsConfiguration(); return txStart(cfg.getDefaultTxConcurrency(), cfg.getDefaultTxIsolation()); } @@ -3740,7 +3740,7 @@ public CacheMetricsImpl metrics0() { A.notNull(concurrency, "concurrency"); A.notNull(isolation, "isolation"); - TransactionsConfiguration cfg = ctx.gridConfig().getTransactionsConfiguration(); + TransactionConfiguration cfg = ctx.gridConfig().getTransactionsConfiguration(); return txStart( concurrency, @@ -4352,7 +4352,7 @@ private int globalSize(boolean primaryOnly) throws IgniteCheckedException { IgniteTxLocalAdapter tx = ctx.tm().threadLocalTx(); if (tx == null || tx.implicit()) { - TransactionsConfiguration tCfg = ctx.gridConfig().getTransactionsConfiguration(); + TransactionConfiguration tCfg = ctx.gridConfig().getTransactionsConfiguration(); tx = ctx.tm().newTx( true, diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java index 8dc1ca75d3a88..e49f6bb0cb1d6 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java @@ -1226,10 +1226,10 @@ private void checkCache(ClusterNode rmt) throws IgniteCheckedException { * @throws IgniteCheckedException If check failed. */ private void checkTransactionConfiguration(ClusterNode rmt) throws IgniteCheckedException { - TransactionsConfiguration txCfg = rmt.attribute(ATTR_TX_CONFIG); + TransactionConfiguration txCfg = rmt.attribute(ATTR_TX_CONFIG); if (txCfg != null) { - TransactionsConfiguration locTxCfg = ctx.config().getTransactionsConfiguration(); + TransactionConfiguration locTxCfg = ctx.config().getTransactionsConfiguration(); if (locTxCfg.isTxSerializableEnabled() != txCfg.isTxSerializableEnabled()) throw new IgniteCheckedException("Serializable transactions enabled mismatch " + diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java index db09bce7818a1..4ea44b1fa742c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java @@ -157,7 +157,7 @@ public String gridName() { * * @return Transactions configuration. */ - public TransactionsConfiguration txConfig() { + public TransactionConfiguration txConfig() { return kernalCtx.config().getTransactionsConfiguration(); } diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTransactionsImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTransactionsImpl.java index 4df963eaaf5ae..f46a59decdaff 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTransactionsImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTransactionsImpl.java @@ -47,7 +47,7 @@ public IgniteTransactionsImpl(GridCacheSharedContext cctx) { /** {@inheritDoc} */ @Override public IgniteTx txStart() throws IllegalStateException { - TransactionsConfiguration cfg = cctx.gridConfig().getTransactionsConfiguration(); + TransactionConfiguration cfg = cctx.gridConfig().getTransactionsConfiguration(); return txStart0( cfg.getDefaultTxConcurrency(), @@ -63,7 +63,7 @@ public IgniteTransactionsImpl(GridCacheSharedContext cctx) { A.notNull(concurrency, "concurrency"); A.notNull(isolation, "isolation"); - TransactionsConfiguration cfg = cctx.gridConfig().getTransactionsConfiguration(); + TransactionConfiguration cfg = cctx.gridConfig().getTransactionsConfiguration(); return txStart0( concurrency, @@ -120,7 +120,7 @@ public IgniteTransactionsImpl(GridCacheSharedContext cctx) { A.notNull(concurrency, "concurrency"); A.notNull(isolation, "isolation"); - TransactionsConfiguration cfg = cctx.gridConfig().getTransactionsConfiguration(); + TransactionConfiguration cfg = cctx.gridConfig().getTransactionsConfiguration(); return txStart0(concurrency, isolation, @@ -196,7 +196,7 @@ public IgniteTransactionsImpl(GridCacheSharedContext cctx) { */ private IgniteInternalTx txStart0(IgniteTxConcurrency concurrency, IgniteTxIsolation isolation, long timeout, int txSize, boolean sys) { - TransactionsConfiguration cfg = cctx.gridConfig().getTransactionsConfiguration(); + TransactionConfiguration cfg = cctx.gridConfig().getTransactionsConfiguration(); if (!cfg.isTxSerializableEnabled() && isolation == SERIALIZABLE) throw new IllegalArgumentException("SERIALIZABLE isolation level is disabled (to enable change " + diff --git a/modules/core/src/main/java/org/apache/ignite/messaging/MessagingListenActor.java b/modules/core/src/main/java/org/apache/ignite/messaging/MessagingListenActor.java index 0c3083a1f9a33..db5cbb6aad178 100644 --- a/modules/core/src/main/java/org/apache/ignite/messaging/MessagingListenActor.java +++ b/modules/core/src/main/java/org/apache/ignite/messaging/MessagingListenActor.java @@ -27,7 +27,7 @@ import java.util.*; /** - * Convenience actor-base adapter for {@link IgniteMessaging#localListen(Object, org.apache.ignite.lang.IgniteBiPredicate)} + * Convenience actor-base adapter for {@link IgniteMessaging#localListen(Object, IgniteBiPredicate)} * method. */ public abstract class MessagingListenActor implements IgniteBiPredicate { diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractProjectionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractProjectionSelfTest.java index 62bb650004d52..ffa967de53bea 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractProjectionSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractProjectionSelfTest.java @@ -828,7 +828,7 @@ public void testTx() throws Exception { tx.commit(); - TransactionsConfiguration tCfg = grid(0).configuration().getTransactionsConfiguration(); + TransactionConfiguration tCfg = grid(0).configuration().getTransactionsConfiguration(); tx = cache().txStart( tCfg.getDefaultTxConcurrency(), diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractPartitionedByteArrayValuesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractPartitionedByteArrayValuesSelfTest.java index 5748f5eaa4cfe..180c808993789 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractPartitionedByteArrayValuesSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractPartitionedByteArrayValuesSelfTest.java @@ -33,7 +33,7 @@ public abstract class GridCacheAbstractPartitionedByteArrayValuesSelfTest extend @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); - TransactionsConfiguration tCfg = new TransactionsConfiguration(); + TransactionConfiguration tCfg = new TransactionConfiguration(); tCfg.setTxSerializableEnabled(true); diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTransformEventSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTransformEventSelfTest.java index fe38c412daf84..eff6fad0a1452 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTransformEventSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTransformEventSelfTest.java @@ -104,7 +104,7 @@ public class GridCacheTransformEventSelfTest extends GridCommonAbstractTest { discoSpi.setIpFinder(IP_FINDER); - TransactionsConfiguration tCfg = cfg.getTransactionsConfiguration(); + TransactionConfiguration tCfg = cfg.getTransactionsConfiguration(); tCfg.setDefaultTxConcurrency(txConcurrency); tCfg.setDefaultTxIsolation(txIsolation); diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxTimeoutSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxTimeoutSelfTest.java index 9a04887a862ea..5a072ab4a4eda 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxTimeoutSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxTimeoutSelfTest.java @@ -40,7 +40,7 @@ public class GridCachePartitionedTxTimeoutSelfTest extends IgniteTxTimeoutAbstra @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration c = super.getConfiguration(gridName); - TransactionsConfiguration txCfg = c.getTransactionsConfiguration(); + TransactionConfiguration txCfg = c.getTransactionsConfiguration(); txCfg.setTxSerializableEnabled(true); txCfg.setDefaultTxTimeout(TIMEOUT); diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedTxMultiThreadedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedTxMultiThreadedSelfTest.java index a2136f4503762..9951bee1802de 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedTxMultiThreadedSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedTxMultiThreadedSelfTest.java @@ -45,7 +45,7 @@ public class GridCacheReplicatedTxMultiThreadedSelfTest extends IgniteTxMultiThr @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration c = super.getConfiguration(gridName); - TransactionsConfiguration tCfg = new TransactionsConfiguration(); + TransactionConfiguration tCfg = new TransactionConfiguration(); tCfg.setTxSerializableEnabled(true); diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheDistributedEvictionsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheDistributedEvictionsSelfTest.java index a5fc5b4ee25d3..67bfb328504b6 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheDistributedEvictionsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheDistributedEvictionsSelfTest.java @@ -67,7 +67,7 @@ public class GridCacheDistributedEvictionsSelfTest extends GridCommonAbstractTes @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration c = super.getConfiguration(gridName); - TransactionsConfiguration tCfg = new TransactionsConfiguration(); + TransactionConfiguration tCfg = new TransactionConfiguration(); tCfg.setDefaultTxConcurrency(PESSIMISTIC); tCfg.setDefaultTxIsolation(READ_COMMITTED); diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEmptyEntriesAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEmptyEntriesAbstractSelfTest.java index 60f5182bd674a..112637567a352 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEmptyEntriesAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEmptyEntriesAbstractSelfTest.java @@ -63,7 +63,7 @@ public abstract class GridCacheEmptyEntriesAbstractSelfTest extends GridCommonAb @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration c = super.getConfiguration(gridName); - TransactionsConfiguration txCfg = c.getTransactionsConfiguration(); + TransactionConfiguration txCfg = c.getTransactionsConfiguration(); txCfg.setDefaultTxConcurrency(txConcurrency); txCfg.setDefaultTxIsolation(txIsolation); diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionTouchSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionTouchSelfTest.java index c6a7823c0b973..79bb4508adcc6 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionTouchSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/GridCacheEvictionTouchSelfTest.java @@ -55,7 +55,7 @@ public class GridCacheEvictionTouchSelfTest extends GridCommonAbstractTest { @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration c = super.getConfiguration(gridName); - TransactionsConfiguration txCfg = c.getTransactionsConfiguration(); + TransactionConfiguration txCfg = c.getTransactionsConfiguration(); txCfg.setDefaultTxConcurrency(PESSIMISTIC); txCfg.setDefaultTxIsolation(REPEATABLE_READ); diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedHitsAndMissesSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedHitsAndMissesSelfTest.java index 1af7e4b31872a..d53526b03e996 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedHitsAndMissesSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedHitsAndMissesSelfTest.java @@ -62,7 +62,7 @@ public class GridCachePartitionedHitsAndMissesSelfTest extends GridCommonAbstrac // Cache. cfg.setCacheConfiguration(cacheConfiguration(gridName)); - TransactionsConfiguration tCfg = new TransactionsConfiguration(); + TransactionConfiguration tCfg = new TransactionConfiguration(); tCfg.setDefaultTxConcurrency(IgniteTxConcurrency.PESSIMISTIC); tCfg.setDefaultTxIsolation(IgniteTxIsolation.REPEATABLE_READ); diff --git a/modules/jta/src/main/java/org/apache/ignite/internal/processors/cache/jta/CacheJtaManager.java b/modules/jta/src/main/java/org/apache/ignite/internal/processors/cache/jta/CacheJtaManager.java index 5e3083637be72..522304528d54a 100644 --- a/modules/jta/src/main/java/org/apache/ignite/internal/processors/cache/jta/CacheJtaManager.java +++ b/modules/jta/src/main/java/org/apache/ignite/internal/processors/cache/jta/CacheJtaManager.java @@ -74,7 +74,7 @@ public class CacheJtaManager extends CacheJtaManagerAdapter { IgniteInternalTx tx = cctx.tm().userTx(); if (tx == null) { - TransactionsConfiguration tCfg = cctx.kernalContext().config() + TransactionConfiguration tCfg = cctx.kernalContext().config() .getTransactionsConfiguration(); tx = cctx.tm().newTx( diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteNode.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteNode.java index b07d1f0bb268d..f03ff669d0bb0 100644 --- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteNode.java +++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteNode.java @@ -107,7 +107,7 @@ public IgniteNode(boolean clientMode, Ignite ignite) { } - TransactionsConfiguration tc = c.getTransactionsConfiguration(); + TransactionConfiguration tc = c.getTransactionsConfiguration(); tc.setDefaultTxConcurrency(args.txConcurrency()); tc.setDefaultTxIsolation(args.txIsolation());