Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 500EA200D0B for ; Tue, 12 Sep 2017 13:27:13 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 4ECDF1609CE; Tue, 12 Sep 2017 11:27:13 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 960431609C6 for ; Tue, 12 Sep 2017 13:27:12 +0200 (CEST) Received: (qmail 82159 invoked by uid 500); 12 Sep 2017 11:27:11 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 82150 invoked by uid 99); 12 Sep 2017 11:27:11 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 12 Sep 2017 11:27:11 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id AD244F57D3; Tue, 12 Sep 2017 11:27:10 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.apache.org Date: Tue, 12 Sep 2017 11:27:10 -0000 Message-Id: <6192a42abbf64348bd551a039910c4e6@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/9] ignite git commit: IGNITE-3558: Use default equals for GridJobWorker. This closes #1326. archived-at: Tue, 12 Sep 2017 11:27:13 -0000 Repository: ignite Updated Branches: refs/heads/ignite-6149 c6f894817 -> 6d1702646 IGNITE-3558: Use default equals for GridJobWorker. This closes #1326. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6983e877 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6983e877 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6983e877 Branch: refs/heads/ignite-6149 Commit: 6983e87743d136857d861f94a82f96dcaef48112 Parents: b4c5d0a Author: tledkov-gridgain Authored: Fri Sep 8 13:40:31 2017 +0300 Committer: devozerov Committed: Fri Sep 8 13:40:31 2017 +0300 ---------------------------------------------------------------------- .../internal/processors/job/GridJobWorker.java | 19 ------------------- ...rtitionOnAffinityRunWithCollisionSpiTest.java | 3 +-- 2 files changed, 1 insertion(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/6983e877/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobWorker.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobWorker.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobWorker.java index 56e3794..cce1077 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobWorker.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobWorker.java @@ -1045,25 +1045,6 @@ public class GridJobWorker extends GridWorker implements GridTimeoutObject { } /** {@inheritDoc} */ - @Override public boolean equals(Object obj) { - if (this == obj) - return true; - - if (obj == null) - return false; - - assert obj instanceof GridJobWorker; - - IgniteUuid jobId1 = ses.getJobId(); - IgniteUuid jobId2 = ((GridJobWorker)obj).ses.getJobId(); - - assert jobId1 != null; - assert jobId2 != null; - - return jobId1.equals(jobId2); - } - - /** {@inheritDoc} */ @Override public int hashCode() { IgniteUuid jobId = ses.getJobId(); http://git-wip-us.apache.org/repos/asf/ignite/blob/6983e877/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheLockPartitionOnAffinityRunWithCollisionSpiTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheLockPartitionOnAffinityRunWithCollisionSpiTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheLockPartitionOnAffinityRunWithCollisionSpiTest.java index f5ccf38..a05e10e 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheLockPartitionOnAffinityRunWithCollisionSpiTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheLockPartitionOnAffinityRunWithCollisionSpiTest.java @@ -81,8 +81,7 @@ public class IgniteCacheLockPartitionOnAffinityRunWithCollisionSpiTest /** * @throws Exception If failed. */ - public void _testJobFinishing() throws Exception { -// fail("Affinity run / call doesn't receive response where many job rejections happen."); + public void testJobFinishing() throws Exception { final AtomicInteger jobNum = new AtomicInteger(0); cancelAllJobs = true;