diff options
2 files changed, 3 insertions, 3 deletions
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.runtime.services/src/org/eclipse/tcf/te/runtime/services/filetransfer/FileTransferItem.java b/target_explorer/plugins/org.eclipse.tcf.te.runtime.services/src/org/eclipse/tcf/te/runtime/services/filetransfer/FileTransferItem.java index bed754c4d..efe020455 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.runtime.services/src/org/eclipse/tcf/te/runtime/services/filetransfer/FileTransferItem.java +++ b/target_explorer/plugins/org.eclipse.tcf.te.runtime.services/src/org/eclipse/tcf/te/runtime/services/filetransfer/FileTransferItem.java @@ -47,7 +47,7 @@ public class FileTransferItem extends PropertiesContainer implements IFileTransf */
@Override
public IPath getHostPath() {
- return new Path(getStringProperty(PROPERTY_HOST));
+ return getStringProperty(PROPERTY_HOST) != null ? new Path(getStringProperty(PROPERTY_HOST)) : null;
}
/* (non-Javadoc)
@@ -55,7 +55,7 @@ public class FileTransferItem extends PropertiesContainer implements IFileTransf */
@Override
public IPath getTargetPath() {
- return new Path(getStringProperty(PROPERTY_TARGET));
+ return getStringProperty(PROPERTY_TARGET) != null ? new Path(getStringProperty(PROPERTY_TARGET)) : null;
}
/* (non-Javadoc)
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/activator/UIPlugin.java b/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/activator/UIPlugin.java index e2ac8b473..c6858f87b 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/activator/UIPlugin.java +++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.views/src/org/eclipse/tcf/te/ui/views/activator/UIPlugin.java @@ -106,7 +106,7 @@ public class UIPlugin extends AbstractUIPlugin { void activateContexts() { if (Display.getCurrent() != null) { IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow(); - if (window != null) windowListener.windowOpened(window); + if (window != null && windowListener != null) windowListener.windowOpened(window); } else { PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable(){ |