Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorslewis2009-05-29 16:04:15 -0400
committerslewis2009-05-29 16:04:15 -0400
commita44bde38d6408b3092e57d6f536569e8212ebf4d (patch)
tree040b7455711bdf6bc320e61d5015fbd5057c1604 /providers/bundles/org.eclipse.ecf.provider.filetransfer
parente565eeb4557ff0a1cbe286be30225619456c3031 (diff)
downloadorg.eclipse.ecf-a44bde38d6408b3092e57d6f536569e8212ebf4d.tar.gz
org.eclipse.ecf-a44bde38d6408b3092e57d6f536569e8212ebf4d.tar.xz
org.eclipse.ecf-a44bde38d6408b3092e57d6f536569e8212ebf4d.zip
Fix for bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=277958
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/retrieve/AbstractRetrieveFileTransfer.java10
1 files changed, 7 insertions, 3 deletions
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 06dc78c6e..c19179da6 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
@@ -152,7 +152,9 @@ public abstract class AbstractRetrieveFileTransfer implements IIncomingFileTrans
if (readInputStream != null)
readInputStream.close();
} catch (final IOException e) {
- Activator.getDefault().log(new Status(IStatus.ERROR, Activator.PLUGIN_ID, IStatus.ERROR, "hardClose", e)); //$NON-NLS-1$
+ Activator a = Activator.getDefault();
+ if (a != null)
+ a.log(new Status(IStatus.ERROR, Activator.PLUGIN_ID, IStatus.ERROR, "hardClose", e)); //$NON-NLS-1$
}
hardClose();
monitor.done();
@@ -163,7 +165,9 @@ public abstract class AbstractRetrieveFileTransfer implements IIncomingFileTrans
fireTransferReceiveDoneEvent();
} catch (Exception e) {
// simply log
- Activator.getDefault().log(new Status(IStatus.ERROR, Activator.PLUGIN_ID, IStatus.ERROR, Messages.AbstractRetrieveFileTransfer_EXCEPTION_IN_FINALLY, e));
+ Activator a = Activator.getDefault();
+ if (a != null)
+ a.log(new Status(IStatus.ERROR, Activator.PLUGIN_ID, IStatus.ERROR, Messages.AbstractRetrieveFileTransfer_EXCEPTION_IN_FINALLY, e));
}
}
return getFinalStatus(exception);
@@ -244,7 +248,7 @@ public abstract class AbstractRetrieveFileTransfer implements IIncomingFileTrans
protected IStatus getFinalStatus(Throwable exception1) {
if (exception1 == null)
- return new Status(IStatus.OK, Activator.getDefault().getBundle().getSymbolicName(), 0, Messages.AbstractRetrieveFileTransfer_Status_Transfer_Completed_OK, 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

Back to the top