svn commit: r1345845 - in /incubator/stanbol/trunk/enhancer/jobmanager/event/src/main/java/org/apache/stanbol/enhancer/jobmanager/event/impl: EnhancementJob.java EnhancementJobHandler.java

[rwesten]

Author: rwesten
Date: Mon Jun  4 07:20:05 2012
New Revision: 1345845

URL: http://svn.apache.org/viewvc?rev=1345845&view=rev
Log:
fixes STANBOL-651

Modified:
    
incubator/stanbol/trunk/enhancer/jobmanager/event/src/main/java/org/apache/stanbol/enhancer/jobmanager/event/impl/EnhancementJob.java
    
incubator/stanbol/trunk/enhancer/jobmanager/event/src/main/java/org/apache/stanbol/enhancer/jobmanager/event/impl/EnhancementJobHandler.java

Modified: 
incubator/stanbol/trunk/enhancer/jobmanager/event/src/main/java/org/apache/stanbol/enhancer/jobmanager/event/impl/EnhancementJob.java
URL: 
http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/jobmanager/event/src/main/java/org/apache/stanbol/enhancer/jobmanager/event/impl/EnhancementJob.java?rev=1345845&r1=1345844&r2=1345845&view=diff
==============================================================================
--- 
incubator/stanbol/trunk/enhancer/jobmanager/event/src/main/java/org/apache/stanbol/enhancer/jobmanager/event/impl/EnhancementJob.java
 (original)
+++ 
incubator/stanbol/trunk/enhancer/jobmanager/event/src/main/java/org/apache/stanbol/enhancer/jobmanager/event/impl/EnhancementJob.java
 Mon Jun  4 07:20:05 2012
@@ -590,7 +590,8 @@ public class EnhancementJob {
         readLock.lock();
         try {
             log.debug(">> r: {}","isFinished");
-            return executable.isEmpty() && running.isEmpty();
+            return running.isEmpty() && // wait for running engine (regard if 
failed or not)
+                    (executable.isEmpty() || isFailed()); //no more engines or 
already failed
         } finally {
             log.debug("<< r: {}","isFinished");
             readLock.unlock();

Modified: 
incubator/stanbol/trunk/enhancer/jobmanager/event/src/main/java/org/apache/stanbol/enhancer/jobmanager/event/impl/EnhancementJobHandler.java
URL: 
http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/jobmanager/event/src/main/java/org/apache/stanbol/enhancer/jobmanager/event/impl/EnhancementJobHandler.java?rev=1345845&r1=1345844&r2=1345845&view=diff
==============================================================================
--- 
incubator/stanbol/trunk/enhancer/jobmanager/event/src/main/java/org/apache/stanbol/enhancer/jobmanager/event/impl/EnhancementJobHandler.java
 (original)
+++ 
incubator/stanbol/trunk/enhancer/jobmanager/event/src/main/java/org/apache/stanbol/enhancer/jobmanager/event/impl/EnhancementJobHandler.java
 Mon Jun  4 07:20:05 2012
@@ -188,7 +188,7 @@ public class EnhancementJobHandler imple
                     for(NonLiteral runningNode : job.getRunning()){
                         running.add(getEngine(job.getExecutionPlan(), 
runningNode));
                     }
-                    log.debug("Job {} failed, but {} still running!",
+                    log.info("Job {} failed, but {} still running!",
                         job.getContentItem().getUri(),running);
                 }
             }