mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-29 19:45:01 +02:00
Code Issues Wiki Activity

[233338] - [concurrency] RequestMonitor.isSuccess() is inconsistent with getStatus().

Browse source
This commit is contained in:
Pawel Piech 2008-05-22 04:56:38 +00:00
parent 6f773242c6
commit c604aca167
4 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
plugins/org.eclipse.dd.dsf.ui/src/org/eclipse/dd/dsf/ui/concurrent/ViewerCountingRequestMonitor.java
View file

@ -33,7 +33,10 @@ public class ViewerCountingRequestMonitor extends CountingRequestMonitor {
@Override @Override
public synchronized boolean isCanceled() { public synchronized boolean isCanceled() {
return fUpdate.isCanceled() || super.isCanceled(); // isCanceled() is called implicitly by the super-constructor before fUpdate
// is initialized. The fUpdate != null is here to protect against an NPE
// from that.
return (fUpdate != null && fUpdate.isCanceled()) || super.isCanceled();
} }
@Override @Override

5
plugins/org.eclipse.dd.dsf/src/org/eclipse/dd/dsf/concurrent/CountingRequestMonitor.java
View file

@ -92,9 +92,8 @@ public class CountingRequestMonitor extends RequestMonitor {
@Override @Override
public synchronized void setStatus(IStatus status) { public synchronized void setStatus(IStatus status) {
if (!(getStatus() instanceof MultiStatus)) { if ((getStatus() instanceof MultiStatus)) {
super.setStatus(new MultiStatus(DsfPlugin.PLUGIN_ID, 0, "Combined status of multiple asynchronous operations", null)); //$NON-NLS-1$ ((MultiStatus)getStatus()).add(status);
} }
((MultiStatus)getStatus()).add(status);
}; };
} }

6
plugins/org.eclipse.dd.dsf/src/org/eclipse/dd/dsf/concurrent/MultiRequestMonitor.java
View file

@ -73,8 +73,10 @@ public class MultiRequestMonitor<V extends RequestMonitor> extends RequestMonito
* <br> * <br>
* @param requestMonitor * @param requestMonitor
*/ */
public void requestMonitorDone(V requestMonitor) { public synchronized void requestMonitorDone(V requestMonitor) {
((MultiStatus)getStatus()).merge(requestMonitor.getStatus()); if (getStatus() instanceof MultiStatus) {
((MultiStatus)getStatus()).merge(requestMonitor.getStatus());
}
assert fStatusMap.containsKey(requestMonitor); assert fStatusMap.containsKey(requestMonitor);
fStatusMap.put(requestMonitor, true); fStatusMap.put(requestMonitor, true);
assert fDoneCounter > 0; assert fDoneCounter > 0;

3
plugins/org.eclipse.dd.dsf/src/org/eclipse/dd/dsf/concurrent/RequestMonitor.java
View file

@ -143,6 +143,9 @@ public class RequestMonitor {
/** Returns the status of the completed method. */ /** Returns the status of the completed method. */
public synchronized IStatus getStatus() { public synchronized IStatus getStatus() {
if (isCanceled()) {
return Status.CANCEL_STATUS;
}
return fStatus; return fStatus;
} }