Author: andre
Date: 2009-11-22 12:54:49 +0100 (Sun, 22 Nov 2009)
New Revision: 39833
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/Processor.java
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/createcaches/Result.java
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/createcaches/TranscoderResult.java
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/createcaches/WaitUntilRecognizedFunction.java
Log:
just log and doc, trying to find bug in getting next result to transcode
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-20 16:40:54 UTC (rev 39832)
+++
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/createcaches/Job.java
2009-11-22 11:54:49 UTC (rev 39833)
@@ -32,7 +32,7 @@
/**
* A Job is associated with a 'source' node, and describes what is currently
happening to create
* 'caches' nodes for it. Such a Job object is created everytime somebody
create a new source
- * object, or explictely triggers the associated 'cache' objects to be
(re)created.
+ * object, or explicitly triggers the associated 'cache' objects to be
(re)created.
*
*/
public class Job implements Iterable<Result> {
@@ -230,6 +230,7 @@
for (; i < results.size(); i++) {
if (results.get(i) != null && !
results.get(i).isReady()) {
current = results.get(i);
+ LOG.debug("not ready? c: " + current);
Job.this.notifyAll();
i++;
break;
@@ -266,7 +267,7 @@
}
}
busy++;
- LOG.debug(" Returning at " + i + " " + current + " ("
+current.isReady());
+ LOG.debug(" Returning at " + i + " " + current + " (" +
current.isReady() + ")");
return current;
}
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-20 16:40:54 UTC (rev 39832)
+++
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/createcaches/JobCallable.java
2009-11-22 11:54:49 UTC (rev 39833)
@@ -21,12 +21,12 @@
/**
* This is the actual callable that can be submitted to the Executors.
- * It can actually be submitted multiple times. Until it is ready.
+ * It can be submitted multiple times. Until it is ready.
*
- * It will do that itself, if it detect that the {...@link Stage} of the job
would change.
-
+ * It will do that itself, if it detects that the {...@link Stage} of the job
would change.
*
* This boils down to iterating the {...@link Job}.
+ *
* @author Michiel Meeuwissen
*/
class JobCallable implements Callable<Integer> {
@@ -99,10 +99,12 @@
try {
Result result = thisJob.getCurrent();
while (true) {
- LOG.info("Executing " + thisJob);
+ LOG.info("Checking to execute " + thisJob);
Result current = thisJob.getCurrent();
if (current == null || current.isReady()) {
+ LOG.info("current: " + current + " ready? " +
current.isReady());
while (iterator.hasNext()) {
+ LOG.info("next !");
iterator.next();
}
current = thisJob.getCurrent();
@@ -111,7 +113,6 @@
if (current.isReady()) {
thisJob.ready();
return resultCount;
-
}
}
Modified:
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/createcaches/Processor.java
===================================================================
---
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/createcaches/Processor.java
2009-11-20 16:40:54 UTC (rev 39832)
+++
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/createcaches/Processor.java
2009-11-22 11:54:49 UTC (rev 39833)
@@ -343,7 +343,7 @@
}
/**
- * Commit the mediastreamsources node and calls createCaches to create
resulting streamscaches nodes
+ * Commits the mediastreamsources node, calls createCaches to create
resulting streamscaches nodes
* and start transcoding.
*/
public void commit(final Node node, final Field field) {
Modified:
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/createcaches/Result.java
===================================================================
---
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/createcaches/Result.java
2009-11-20 16:40:54 UTC (rev 39832)
+++
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/createcaches/Result.java
2009-11-22 11:54:49 UTC (rev 39833)
@@ -17,7 +17,7 @@
/**
- * When executing an actual {...@link JobDefinition} the result is contain in
an object like this.
+ * When executing an actual {...@link JobDefinition} the result is contained
in an object like this.
* @author Michiel Meeuwissen
* @version $Id$
*/
Modified:
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/createcaches/TranscoderResult.java
===================================================================
---
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/createcaches/TranscoderResult.java
2009-11-20 16:40:54 UTC (rev 39832)
+++
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/createcaches/TranscoderResult.java
2009-11-22 11:54:49 UTC (rev 39833)
@@ -21,7 +21,8 @@
/**
- * Container for the result of a JobDefinition This is the result of an actual
transcoding. This means that it does have a 'destination' node {...@link
#getDestination()} and URI {...@link #getOut()}.
+ * Container for the result of a JobDefinition This is the result of an actual
transcoding.
+ * This means that it does have a 'destination' node {...@link
#getDestination()} and URI {...@link #getOut()}.
*
* @author Michiel Meeuwissen
* @version $Id$
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-20 16:40:54 UTC (rev 39832)
+++
mmbase/trunk/applications/streams/src/main/java/org/mmbase/streams/createcaches/WaitUntilRecognizedFunction.java
2009-11-22 11:54:49 UTC (rev 39833)
@@ -15,7 +15,7 @@
/**
*
- * @author Andr� van Toly
+ * @author Andr� van Toly
* @version $Id$
*/
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
