ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [1/9] ignite git commit: IGNITE-3558: Use default equals for GridJobWorker. This closes #1326.
Date Tue, 12 Sep 2017 11:27:10 GMT
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 <tledkov@gridgain.com>
Authored: Fri Sep 8 13:40:31 2017 +0300
Committer: devozerov <vozerov@gridgain.com>
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;


Mime
View raw message