diff options
| author | Marc-Andre Laperle | 2014-09-09 21:49:35 +0000 |
|---|---|---|
| committer | Marc-Andre Laperle | 2014-09-10 00:49:33 +0000 |
| commit | 47d1ed9b786018f2f5da5c86a1fa2d4386fd8c9f (patch) | |
| tree | 3629a8341f0f4e12ab59727fdf0035a0aafe477d | |
| parent | 1b5acafd8bbf9b10294e9457ed15e77a8ed08b15 (diff) | |
| download | org.eclipse.linuxtools-47d1ed9b786018f2f5da5c86a1fa2d4386fd8c9f.tar.gz org.eclipse.linuxtools-47d1ed9b786018f2f5da5c86a1fa2d4386fd8c9f.tar.xz org.eclipse.linuxtools-47d1ed9b786018f2f5da5c86a1fa2d4386fd8c9f.zip | |
tmf: Fix IllegalArgumentException when importing from the root directory
Bug: 443651
Change-Id: I5fb050a4c35f27c4393f30ba0b9836cc656e76de
Signed-off-by: Marc-Andre Laperle <marc-andre.laperle@ericsson.com>
Reviewed-on: https://git.eclipse.org/r/33152
Tested-by: Hudson CI
Reviewed-by: Bernd Hufmann <bernd.hufmann@ericsson.com>
Tested-by: Bernd Hufmann <bernd.hufmann@ericsson.com>
| -rw-r--r-- | lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/wizards/importtrace/ImportTraceWizardPage.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/wizards/importtrace/ImportTraceWizardPage.java b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/wizards/importtrace/ImportTraceWizardPage.java index 8872f80bd2..84d97660c6 100644 --- a/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/wizards/importtrace/ImportTraceWizardPage.java +++ b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/wizards/importtrace/ImportTraceWizardPage.java @@ -757,9 +757,13 @@ public class ImportTraceWizardPage extends WizardResourceImportPage { return adapted; } - public IFileSystemObject getIFileSystemObject(Object o) { + public IFileSystemObject getIFileSystemObject(Object o) { + if (o == null) { + return null; + } + if (o instanceof File) { - return new FileFileSystemObject((File)o); + return new FileFileSystemObject((File) o); } else if (o instanceof TarEntry) { return new TarFileSystemObject((TarEntry) o, fArchivePath); } else if (o instanceof ZipEntry) { |