mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-15 21:15:23 +02:00
Code Issues Wiki Activity

[249544] also check that monitor is not cancelled

Browse source
This commit is contained in:
David McKnight 2008-10-17 15:33:22 +00:00
parent 8deddd5549
commit eb66a5e2ff
2 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemUniversalTempFileListener.java
View file

@ -303,7 +303,7 @@ public class SystemUniversalTempFileListener extends SystemTempFileListener
} }
// waiting to make sure the file's timestamp is uptodate // waiting to make sure the file's timestamp is uptodate
remoteFile = waitForTimestampToBeUpToDate(remoteFile, monitor); remoteFile = waitForTimestampToBeUpToDate(remoteFile,remoteModifiedStamp, monitor);
@ -374,18 +374,20 @@ public class SystemUniversalTempFileListener extends SystemTempFileListener
} }
} }
private IRemoteFile waitForTimestampToBeUpToDate(IRemoteFile remoteFile, IProgressMonitor monitor) private IRemoteFile waitForTimestampToBeUpToDate(IRemoteFile remoteFile, long originalTimestamp, IProgressMonitor monitor)
{ {
IRemoteFileSubSystem fs = remoteFile.getParentRemoteFileSubSystem(); IRemoteFileSubSystem fs = remoteFile.getParentRemoteFileSubSystem();
String path = remoteFile.getAbsolutePath(); String path = remoteFile.getAbsolutePath();
long originalTimestamp = remoteFile.getLastModified();
try { try {
long timestamp = originalTimestamp; long timestamp = originalTimestamp;
boolean fileUpdated = false; boolean fileUpdated = false;
boolean timestampChanging = true; boolean timestampChanging = true;
while (timestampChanging || !fileUpdated){ // wait until the timestamp stops changing AND timestamp did change at least once int MAX_TIMES_CHECKED = 100; // make sure we don't wait indefinitely
int timesChecked = 0;
while ((timestampChanging || !fileUpdated) && !monitor.isCanceled()){ // wait until the timestamp stops changing AND timestamp did change at least once
try { try {
Thread.sleep(500); // sleep Thread.sleep(500); // sleep
} }
@ -406,6 +408,12 @@ public class SystemUniversalTempFileListener extends SystemTempFileListener
} }
timestamp = nextTimestamp; timestamp = nextTimestamp;
timesChecked++;
if (timesChecked >= MAX_TIMES_CHECKED){ // we're not expecting this, but it's better to timeout than to hang on this
SystemBasePlugin.logError("timeout waiting for timestamp after upload of "+ path); //$NON-NLS-1$
return remoteFile;
}
} }
} }
catch (SystemMessageException e){ catch (SystemMessageException e){

2
rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/internal/files/ui/actions/SystemUploadConflictAction.java
View file

@ -234,7 +234,7 @@ public class SystemUploadConflictAction extends SystemBaseAction implements Runn
int MAX_TIMES_CHECKED = 100; // make sure we don't wait indefinitely int MAX_TIMES_CHECKED = 100; // make sure we don't wait indefinitely
int timesChecked = 0; int timesChecked = 0;
while (timestampChanging || !fileUpdated){ // wait until the timestamp stops changing AND timestamp did change at least once while ((timestampChanging || !fileUpdated) && !monitor.isCanceled()){ // wait until the timestamp stops changing AND timestamp did change at least once
try { try {
Thread.sleep(500); // sleep Thread.sleep(500); // sleep
} }