IGNITE-389 - Fixing tests.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/224cbcb1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/224cbcb1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/224cbcb1 Branch: refs/heads/ignite-1009-v4 Commit: 224cbcb1fbd283a3015b73fecfbf364cc2670ff1 Parents: 2c3acf0 Author: Alexey Goncharuk <agoncha...@gridgain.com> Authored: Mon Jun 8 17:41:33 2015 -0700 Committer: Alexey Goncharuk <agoncha...@gridgain.com> Committed: Mon Jun 8 17:41:33 2015 -0700 ---------------------------------------------------------------------- examples/config/example-ignite.xml | 4 +--- .../internal/processors/cache/query/GridCacheQueryAdapter.java | 1 + .../internal/processors/datastructures/GridCacheSetImpl.java | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/224cbcb1/examples/config/example-ignite.xml ---------------------------------------------------------------------- diff --git a/examples/config/example-ignite.xml b/examples/config/example-ignite.xml index dcb2ba8..e746e59 100644 --- a/examples/config/example-ignite.xml +++ b/examples/config/example-ignite.xml @@ -30,16 +30,14 @@ http://www.springframework.org/schema/util/spring-util.xsd";> <bean id="ignite.cfg" class="org.apache.ignite.configuration.IgniteConfiguration"> <!-- Set to true to enable distributed class loading for examples, default is false. --> -<!-- <property name="peerClassLoadingEnabled" value="true"/> <property name="marshaller"> <bean class="org.apache.ignite.marshaller.optimized.OptimizedMarshaller"> - <!– Set to false to allow non-serializable objects in examples, default is true. –> + <!-- Set to false to allow non-serializable objects in examples, default is true. --> <property name="requireSerializable" value="false"/> </bean> </property> ---> <!-- Enable task execution events for examples. --> <property name="includeEventTypes"> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/224cbcb1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryAdapter.java index eaf7515..5b82c34 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryAdapter.java @@ -123,6 +123,7 @@ public class GridCacheQueryAdapter<T> implements CacheQuery<T> { boolean keepPortable) { assert cctx != null; assert type != null; + assert part == null || part >= 0; this.cctx = cctx; this.type = type; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/224cbcb1/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheSetImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheSetImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheSetImpl.java index c0e763f..f74fe95 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheSetImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheSetImpl.java @@ -114,7 +114,7 @@ public class GridCacheSetImpl<T> extends AbstractCollection<T> implements Ignite } CacheQuery qry = new GridCacheQueryAdapter<>(ctx, SET, null, null, - new GridSetQueryPredicate<>(id, collocated), -1, false, false); + new GridSetQueryPredicate<>(id, collocated), null, false, false); Collection<ClusterNode> nodes = dataNodes(ctx.affinity().affinityTopologyVersion());
