ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From agoncha...@apache.org
Subject [19/50] incubator-ignite git commit: Merge branch 'ignite-798' into ignite-sprint-4
Date Tue, 28 Apr 2015 22:50:59 GMT
Merge branch 'ignite-798' into ignite-sprint-4


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/19bd6117
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/19bd6117
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/19bd6117

Branch: refs/heads/ignite-80
Commit: 19bd61178597f6778a71280bd2433d37573f7de1
Parents: ade27b4 43963a8
Author: Andrey <anovikov@gridgain.com>
Authored: Tue Apr 28 15:35:19 2015 +0700
Committer: Andrey <anovikov@gridgain.com>
Committed: Tue Apr 28 15:36:30 2015 +0700

----------------------------------------------------------------------
 .../java/org/apache/ignite/internal/GridJobContextImpl.java   | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/19bd6117/modules/core/src/main/java/org/apache/ignite/internal/GridJobContextImpl.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/GridJobContextImpl.java
index a1e0135,8f2c9ac..1dd3c71
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridJobContextImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridJobContextImpl.java
@@@ -169,10 -169,9 +169,9 @@@ public class GridJobContextImpl impleme
              if (job == null)
                  job = ctx.job().activeJob(jobId);
  
-             // Completed?
-             if (job != null && !job.isDone()) {
+             if (job != null) {
                  if (!job.hold())
--                    throw new IllegalStateException("Job has already been held [ctx=" +
this + ']');
++                    throw new IllegalStateException("Job has already been hold [ctx=" +
this + ']');
  
                  assert timeoutObj == null;
  
@@@ -184,7 -183,7 +183,7 @@@
                  // Overflow.
                  if (endTime > 0) {
                      timeoutObj = new GridTimeoutObject() {
--                        private final IgniteUuid id = IgniteUuid.randomUuid();;
++                        private final IgniteUuid id = IgniteUuid.randomUuid();
  
                          @Override public IgniteUuid timeoutId() {
                              return id;


Mime
View raw message