Merge remote-tracking branch 'upstream/master'

Conflicts: src/copilot-agent/lib/Copilot/Component/Agent.pm
josip · Aug 6, 2012 · e2ee222 · e2ee222
2 parents cfaa888 + 2753d7e
commit e2ee222
Showing 1 changed file with 0 additions and 2 deletions.
diff --git a/src/copilot-agent/lib/Copilot/Component/Agent.pm b/src/copilot-agent/lib/Copilot/Component/Agent.pm
@@ -1059,8 +1059,6 @@ sub jobWheelFinishedHandler
 
     my $jobID = $heap->{'currentJobID'};
 
-    return if ($childPID != $heap->{$jobID}->{'childPID'});
-
     # Child process (PID: $childPid) for job (Job ID: $jobID) finished with: $retVal
     $heap->{$jobID}->{'exitCode'}  = $exitCode;