Author: andre
Date: 2009-11-22 21:29:41 +0100 (Sun, 22 Nov 2009)
New Revision: 39837
Modified:
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/createcaches/Job.java
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/createcaches/JobCallable.java
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/createcaches/WaitUntilRecognizedFunction.java
Log:
just doc etc.
Modified:
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/createcaches/Job.java
===================================================================
---
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/createcaches/Job.java
2009-11-22 20:17:13 UTC (rev 39836)
+++
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/createcaches/Job.java
2009-11-22 20:29:41 UTC (rev 39837)
@@ -273,7 +273,6 @@
};
}
-
/**
* Start actually executing this Jobs.
*/
@@ -282,13 +281,12 @@
submit(callable);
}
-
/**
* Re-submit this job.
*/
void submit(final JobCallable jc) {
if (getStage() == Stage.READY) {
- LOG.info("Will not submit, because we're ready" + jc);
+ LOG.info("Will not submit, because we're ready" + jc);
} else {
LOG.info("Will submit " + jc);
ThreadPools.jobsExecutor.execute(new Runnable() {
@@ -301,7 +299,7 @@
}
Stage s = getCurrent().getStage();
LOG.info("to " + s);
- future = processor.threadPools.get(s).submit(jc);
+ future = processor.threadPools.get(s).submit(jc);
Job.this.notifyAll();
}
}
@@ -399,20 +397,19 @@
findResults();
}
public synchronized void interrupt() {
-
- Node cacheNode = current.getDestination();
- if (cacheNode != null &&
node.getCloud().hasNode(cacheNode.getNumber())) {
- cacheNode.setIntValue("state", State.INTERRUPTED.getValue());
- cacheNode.commit();
- }
- interrupted = true;
- if (thread != null) {
- logger.info("Interrupting " + thread);
- thread.interrupt();
- } else {
- logger.info("No Thread in " + this);
- }
+ Node cacheNode = current.getDestination();
+ if (cacheNode != null &&
node.getCloud().hasNode(cacheNode.getNumber())) {
+ cacheNode.setIntValue("state", State.INTERRUPTED.getValue());
+ cacheNode.commit();
}
+ interrupted = true;
+ if (thread != null) {
+ logger.info("Interrupting " + thread);
+ thread.interrupt();
+ } else {
+ logger.info("No Thread in " + this);
+ }
+ }
public boolean isInterrupted() {
return interrupted;
}
@@ -434,10 +431,11 @@
}
public synchronized void waitUntilAfter(Stage stage) throws
InterruptedException {
- while (getStage().ordinal() <= stage.ordinal()) {
- wait();
- }
+ LOG.info("Waiting untill after " + stage);
+ while (getStage().ordinal() <= stage.ordinal()) {
+ wait();
}
+ }
public Stage getStage() {
if (ready) return Stage.READY;
@@ -445,7 +443,6 @@
return res == null ? Stage.UNSTARTED :
res.getJobDefinition().getStage();
}
-
public String getProgress() {
return "" + busy + "/" + results.size();
}
Modified:
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/createcaches/JobCallable.java
===================================================================
---
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/createcaches/JobCallable.java
2009-11-22 20:17:13 UTC (rev 39836)
+++
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/createcaches/JobCallable.java
2009-11-22 20:29:41 UTC (rev 39837)
@@ -111,6 +111,7 @@
LOG.info("Found " + current);
if (current.isReady()) {
thisJob.ready();
+ LOG.info("1: returning resultCount: " + resultCount);
return resultCount;
}
@@ -121,6 +122,7 @@
thisJob.submit(this);
} catch (Exception e) {
}
+ LOG.info("2: returning resultCount: " + resultCount);
return resultCount;
}
result = current;
@@ -176,6 +178,7 @@
//thisJob.ready(); // notify waiters
//runningJobs.remove(thisJob.getNode().getNumber());
}
+ logger.info("3: returning resultCount: " + resultCount);
return resultCount;
}
Modified:
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/createcaches/WaitUntilRecognizedFunction.java
===================================================================
---
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/createcaches/WaitUntilRecognizedFunction.java
2009-11-22 20:17:13 UTC (rev 39836)
+++
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/createcaches/WaitUntilRecognizedFunction.java
2009-11-22 20:29:41 UTC (rev 39837)
@@ -39,8 +39,8 @@
return false;
}
}
+
return true;
-
}
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
