Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Khouzam2015-05-28 16:42:32 +0000
committerMatthew Khouzam2015-06-02 13:08:51 +0000
commit37543966c0f94d92e2a5555470e79c39391967bd (patch)
tree2de3ff1189da9b10a1fae533fc17e50bb90191dc /org.eclipse.tracecompass.tmf.ui
parent37e938ee12d0219dfca1d8d540823d2a5e9f4f20 (diff)
downloadorg.eclipse.tracecompass-37543966c0f94d92e2a5555470e79c39391967bd.tar.gz
org.eclipse.tracecompass-37543966c0f94d92e2a5555470e79c39391967bd.tar.xz
org.eclipse.tracecompass-37543966c0f94d92e2a5555470e79c39391967bd.zip
tmf.ui: clarify exception handling in ImportTraceWizardPage
Also avoid an NPE that doesn't happen yet because of validation, not design. Change-Id: I4a1e5918dea4343250150952974f9286c3ccb177 Signed-off-by: Matthew Khouzam <matthew.khouzam@ericsson.com> Reviewed-on: https://git.eclipse.org/r/48896 Reviewed-by: Hudson CI Reviewed-by: Marc-Andre Laperle <marc-andre.laperle@ericsson.com>
Diffstat (limited to 'org.eclipse.tracecompass.tmf.ui')
-rw-r--r--org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/project/wizards/importtrace/ImportTraceWizardPage.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/project/wizards/importtrace/ImportTraceWizardPage.java b/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/project/wizards/importtrace/ImportTraceWizardPage.java
index 88ccb1977f..7377dec638 100644
--- a/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/project/wizards/importtrace/ImportTraceWizardPage.java
+++ b/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/project/wizards/importtrace/ImportTraceWizardPage.java
@@ -827,9 +827,10 @@ public class ImportTraceWizardPage extends WizardResourceImportPage {
GzipFile zipFile = null;
try {
zipFile = new GzipFile(archivePath);
+ leveledImportStructureProvider = new FileSystemObjectLeveledImportStructureProvider(new GzipLeveledStructureProvider(zipFile), archivePath);
} catch (IOException e) {
+ // do nothing
}
- leveledImportStructureProvider = new FileSystemObjectLeveledImportStructureProvider(new GzipLeveledStructureProvider(zipFile), archivePath);
}
if (leveledImportStructureProvider == null) {
return null;
@@ -996,6 +997,7 @@ public class ImportTraceWizardPage extends WizardResourceImportPage {
specifiedTarSourceFile.close();
return true;
} catch (IOException e) {
+ // ignore
}
}
return false;

Back to the top