Skip to content
Snippets Groups Projects
Commit 21312ff1 authored by gmantele's avatar gmantele
Browse files

UWS: Fix bug: logical error while trying to get the error that occurred in a UWSThread

parent c85a8b7c
No related branches found
No related tags found
No related merge requests found
...@@ -31,16 +31,13 @@ import java.util.Map; ...@@ -31,16 +31,13 @@ import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.Vector; import java.util.Vector;
import java.lang.IllegalStateException;
import javax.servlet.ServletOutputStream; import javax.servlet.ServletOutputStream;
import uws.UWSException; import uws.UWSException;
import uws.UWSExceptionFactory; import uws.UWSExceptionFactory;
import uws.UWSToolBox; import uws.UWSToolBox;
import uws.job.manager.ExecutionManager; import uws.job.manager.ExecutionManager;
import uws.job.parameters.UWSParameters; import uws.job.parameters.UWSParameters;
import uws.job.serializer.UWSSerializer; import uws.job.serializer.UWSSerializer;
import uws.job.user.JobOwner; import uws.job.user.JobOwner;
import uws.service.UWS; import uws.service.UWS;
...@@ -1648,7 +1645,7 @@ public class UWSJob extends SerializableUWSObject { ...@@ -1648,7 +1645,7 @@ public class UWSJob extends SerializableUWSObject {
* @return The error which interrupts the thread or <i>null</i> if there was no error or if the job is still running. * @return The error which interrupts the thread or <i>null</i> if there was no error or if the job is still running.
*/ */
public final UWSException getWorkError(){ public final UWSException getWorkError(){
return (thread == null && !thread.isAlive()) ? null : thread.getError(); return (thread == null || !thread.isAlive()) ? null : thread.getError();
} }
/* ************* */ /* ************* */
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment