Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorslewis2009-10-22 11:22:25 -0400
committerslewis2009-10-22 11:22:25 -0400
commite73b36c6aefe123d2510a66962d01e97a7cb00ae (patch)
tree697bfd38c58a66f60429d23f3206d5036a06e970 /providers/bundles/org.eclipse.ecf.provider.filetransfer
parentcba5543d73553a5f549ef4d5ac60ff12127e4378 (diff)
downloadorg.eclipse.ecf-e73b36c6aefe123d2510a66962d01e97a7cb00ae.tar.gz
org.eclipse.ecf-e73b36c6aefe123d2510a66962d01e97a7cb00ae.tar.xz
org.eclipse.ecf-e73b36c6aefe123d2510a66962d01e97a7cb00ae.zip
change final status to (for existing providers) always return status OK. See discussion in comments on bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=292972
Diffstat (limited to 'providers/bundles/org.eclipse.ecf.provider.filetransfer')
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/outgoing/AbstractOutgoingFileTransfer.java9
-rw-r--r--providers/bundles/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/retrieve/AbstractRetrieveFileTransfer.java9
2 files changed, 2 insertions, 16 deletions
diff --git a/providers/bundles/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/outgoing/AbstractOutgoingFileTransfer.java b/providers/bundles/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/outgoing/AbstractOutgoingFileTransfer.java
index fca6b417d..95ecf8c4d 100644
--- a/providers/bundles/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/outgoing/AbstractOutgoingFileTransfer.java
+++ b/providers/bundles/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/outgoing/AbstractOutgoingFileTransfer.java
@@ -57,8 +57,6 @@ public abstract class AbstractOutgoingFileTransfer implements IOutgoingFileTrans
public static final int DEFAULT_BUF_LENGTH = 4096;
- private static final int FILETRANSFER_ERRORCODE = 1001;
-
protected Job job;
protected URL remoteFileURL;
@@ -151,12 +149,7 @@ public abstract class AbstractOutgoingFileTransfer implements IOutgoingFileTrans
}
protected IStatus getFinalStatus(Throwable exception1) {
- if (exception1 == null)
- return new Status(IStatus.OK, Activator.getDefault().getBundle().getSymbolicName(), 0, Messages.AbstractOutgoingFileTransfer_Status_Transfer_Completed_OK, null);
- else if (exception1 instanceof UserCancelledException)
- return new Status(IStatus.CANCEL, Activator.PLUGIN_ID, FILETRANSFER_ERRORCODE, Messages.AbstractOutgoingFileTransfer_Exception_User_Cancelled, exception1);
- else
- return new Status(IStatus.ERROR, Activator.PLUGIN_ID, FILETRANSFER_ERRORCODE, Messages.AbstractOutgoingFileTransfer_Status_Transfer_Exception, exception1);
+ return Status.OK_STATUS;
}
protected void hardClose() {
diff --git a/providers/bundles/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/retrieve/AbstractRetrieveFileTransfer.java b/providers/bundles/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/retrieve/AbstractRetrieveFileTransfer.java
index c19179da6..cba2189ae 100644
--- a/providers/bundles/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/retrieve/AbstractRetrieveFileTransfer.java
+++ b/providers/bundles/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/retrieve/AbstractRetrieveFileTransfer.java
@@ -66,8 +66,6 @@ public abstract class AbstractRetrieveFileTransfer implements IIncomingFileTrans
public static final int DEFAULT_BUF_LENGTH = 4096;
- private static final int FILETRANSFER_ERRORCODE = 1001;
-
protected static final int POLLING_RETRY_ATTEMPTS = 20;
protected static final int TIMEOUT_INPUTSTREAM_BUFFER_SIZE = 8192;
@@ -247,12 +245,7 @@ public abstract class AbstractRetrieveFileTransfer implements IIncomingFileTrans
}
protected IStatus getFinalStatus(Throwable exception1) {
- if (exception1 == null)
- return new Status(IStatus.OK, Activator.PLUGIN_ID, 0, Messages.AbstractRetrieveFileTransfer_Status_Transfer_Completed_OK, null);
- else if (exception1 instanceof UserCancelledException)
- return new Status(IStatus.CANCEL, Activator.PLUGIN_ID, FILETRANSFER_ERRORCODE, Messages.AbstractRetrieveFileTransfer_Exception_User_Cancelled, exception1);
- else
- return new Status(IStatus.ERROR, Activator.PLUGIN_ID, FILETRANSFER_ERRORCODE, Messages.AbstractRetrieveFileTransfer_Status_Transfer_Exception, exception1);
+ return Status.OK_STATUS;
}
protected void hardClose() {

Back to the top