git://source.jalview.org
/
jalview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f03c98d
)
status can be null to begin with
author
jprocter
<Jim Procter>
Mon, 17 May 2010 16:15:12 +0000
(16:15 +0000)
committer
jprocter
<Jim Procter>
Mon, 17 May 2010 16:15:12 +0000
(16:15 +0000)
src/jalview/ws/jws2/JWs2Job.java
patch
|
blob
|
history
diff --git
a/src/jalview/ws/jws2/JWs2Job.java
b/src/jalview/ws/jws2/JWs2Job.java
index
4bf97a3
..
0239537
100644
(file)
--- a/
src/jalview/ws/jws2/JWs2Job.java
+++ b/
src/jalview/ws/jws2/JWs2Job.java
@@
-73,7
+73,7
@@
public abstract class JWs2Job extends AWsJob
@Override
public boolean isBroken()
{
@Override
public boolean isBroken()
{
- return status.equals(status.UNDEFINED);
+ return status==null ? false : status.equals(status.UNDEFINED);
}
/* (non-Javadoc)
}
/* (non-Javadoc)
@@
-82,7
+82,7
@@
public abstract class JWs2Job extends AWsJob
@Override
public boolean isFailed()
{
@Override
public boolean isFailed()
{
- return status.equals(status.FAILED);
+ return status==null ? false : status.equals(status.FAILED);
}
/* (non-Javadoc)
}
/* (non-Javadoc)
@@
-91,7
+91,7
@@
public abstract class JWs2Job extends AWsJob
@Override
public boolean isFinished()
{
@Override
public boolean isFinished()
{
- return status.equals(status.FINISHED);
+ return status==null ? false : status.equals(status.FINISHED);
}
/* (non-Javadoc)
}
/* (non-Javadoc)
@@
-100,7
+100,7
@@
public abstract class JWs2Job extends AWsJob
@Override
public boolean isQueued()
{
@Override
public boolean isQueued()
{
- return status.equals(status.SUBMITTED) || status.equals(status.PENDING);
+ return status==null ? false : status.equals(status.SUBMITTED) || status.equals(status.PENDING);
}
/* (non-Javadoc)
}
/* (non-Javadoc)
@@
-110,7
+110,7
@@
public abstract class JWs2Job extends AWsJob
public boolean isRunning()
{
// TODO Auto-generated method stub
public boolean isRunning()
{
// TODO Auto-generated method stub
- return status.equals(status.RUNNING) || status.equals(status.STARTED);
+ return status!=null && (status.equals(status.RUNNING) || status.equals(status.STARTED));
}
/* (non-Javadoc)
}
/* (non-Javadoc)
@@
-120,7
+120,7
@@
public abstract class JWs2Job extends AWsJob
public boolean isServerError()
{
// server errors are raised as exceptions on the service method calls.
public boolean isServerError()
{
// server errors are raised as exceptions on the service method calls.
- return false; // status.equals(status.FAILED);
+ return status==null ? false : false; // status.equals(status.FAILED);
}
}
}
}