Merge branch 'master' into lttng-luna

[deliverable/tracecompass.git] / org.eclipse.linuxtools.lttng2.kernel.core / src / org / eclipse / linuxtools / lttng2 / kernel / core / trace / LttngKernelTrace.java

diff --git a/org.eclipse.linuxtools.lttng2.kernel.core/src/org/eclipse/linuxtools/lttng2/kernel/core/trace/LttngKernelTrace.java b/org.eclipse.linuxtools.lttng2.kernel.core/src/org/eclipse/linuxtools/lttng2/kernel/core/trace/LttngKernelTrace.java
index d358e931b98e761a3846872f05ef0390dd152862..6ea09e1cbb6e376b56fb531cdd05394f769aec15 100644 (file)
--- a/org.eclipse.linuxtools.lttng2.kernel.core/src/org/eclipse/linuxtools/lttng2/kernel/core/trace/LttngKernelTrace.java
+++ b/org.eclipse.linuxtools.lttng2.kernel.core/src/org/eclipse/linuxtools/lttng2/kernel/core/trace/LttngKernelTrace.java
@@ -14,6 +14,7 @@
 package org.eclipse.linuxtools.lttng2.kernel.core.trace;
 
 import java.io.File;
+import java.nio.BufferOverflowException;
 
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.IStatus;
@@ -75,6 +76,9 @@ public class LttngKernelTrace extends CtfTmfTrace {
         } catch (NullPointerException e){
             validStatus = new Status(IStatus.ERROR,  Activator.PLUGIN_ID, e.toString(), e);
             return validStatus;
+        } catch (final BufferOverflowException e) {
+            validStatus = new Status(IStatus.ERROR, Activator.PLUGIN_ID, Messages.LttngKernelTrace_TraceReadError + ": " + Messages.LttngKernelTrace_MalformedTrace); //$NON-NLS-1$
+            return validStatus;
         }
 
         /* Make sure the domain is "kernel" in the trace's env vars */