Repository: ignite Updated Branches: refs/heads/ignite-1607-read 0dde0ac25 -> b5068e92b
ignite-1607 WIP Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b5068e92 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b5068e92 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b5068e92 Branch: refs/heads/ignite-1607-read Commit: b5068e92bc44f892bfb0217515afd78acabaf1b1 Parents: 0dde0ac Author: sboikov <[email protected]> Authored: Mon Oct 12 17:17:25 2015 +0300 Committer: sboikov <[email protected]> Committed: Mon Oct 12 17:17:25 2015 +0300 ---------------------------------------------------------------------- .../internal/processors/cache/transactions/IgniteTxAdapter.java | 3 +-- .../near/GridCachePartitionedTxMultiThreadedSelfTest.java | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/b5068e92/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java ---------------------------------------------------------------------- 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 c896f6a..a211058 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 @@ -1503,9 +1503,8 @@ public abstract class IgniteTxAdapter extends GridMetadataAwareAdapter * @param e Entry to evict if it qualifies for eviction. * @param primaryOnly Flag to try to evict only on primary node. * @return {@code True} if attempt was made to evict the entry. - * @throws IgniteCheckedException If failed. */ - protected boolean evictNearEntry(IgniteTxEntry e, boolean primaryOnly) throws IgniteCheckedException { + protected boolean evictNearEntry(IgniteTxEntry e, boolean primaryOnly) { assert e != null; if (isNearLocallyMapped(e, primaryOnly)) { http://git-wip-us.apache.org/repos/asf/ignite/blob/b5068e92/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxMultiThreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxMultiThreadedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxMultiThreadedSelfTest.java index f76361a..abf1d6e 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxMultiThreadedSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxMultiThreadedSelfTest.java @@ -51,6 +51,8 @@ public class GridCachePartitionedTxMultiThreadedSelfTest extends IgniteTxMultiTh cc.setCacheMode(PARTITIONED); cc.setBackups(1); + cc.setNearConfiguration(null); + cc.setEvictionPolicy(null); cc.setWriteSynchronizationMode(FULL_SYNC);
