Merge remote-tracking branch 'origin/ignite-565' into ignite-565
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/195ed52c Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/195ed52c Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/195ed52c Branch: refs/heads/ignite-496 Commit: 195ed52c2a0f7320c1cb989215a29992c883c740 Parents: c463a8d 68c68f7 Author: sboikov <sboi...@gridgain.com> Authored: Thu Mar 26 15:59:25 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Thu Mar 26 15:59:25 2015 +0300 ---------------------------------------------------------------------- .../cache/GridCacheCrossCacheQuerySelfTest.java | 45 ++++++-------------- 1 file changed, 14 insertions(+), 31 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/195ed52c/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTest.java ---------------------------------------------------------------------- diff --cc modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTest.java index 32d863f,b344a41..cc5f914 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTest.java @@@ -320,9 -328,9 +328,8 @@@ public class GridCacheCrossCacheQuerySe } }); - List<DimProduct> dimProds = new ArrayList<>(prods.values()); Collections.sort(dimProds, new Comparator<DimProduct>() { - @Override - public int compare(DimProduct o1, DimProduct o2) { + @Override public int compare(DimProduct o1, DimProduct o2) { return o1.getId() > o2.getId() ? 1 : o1.getId() < o2.getId() ? -1 : 0; } });
