2010-10-27 Francois Chouinard <fchouinard@gmail.com> Contribution for Bug316467

[deliverable/tracecompass.git] / org.eclipse.linuxtools.lttng.ui / src / org / eclipse / linuxtools / lttng / ui / model / trange / TimeRangeResourceFactory.java

diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/model/trange/TimeRangeResourceFactory.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/model/trange/TimeRangeResourceFactory.java
index 94f2340f4450f960affe5339f6967e6ce36cad29..b09ddf6642e4b411c3da206665fc1303c803d6d9 100644 (file)
--- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/model/trange/TimeRangeResourceFactory.java
+++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/model/trange/TimeRangeResourceFactory.java
@@ -13,6 +13,7 @@ package org.eclipse.linuxtools.lttng.ui.model.trange;
 
 
 import org.eclipse.linuxtools.lttng.state.StateStrings;
+import org.eclipse.linuxtools.lttng.state.model.LTTngCPUState;
 import org.eclipse.linuxtools.lttng.state.model.LttngIRQState;
 import org.eclipse.linuxtools.lttng.state.model.LttngTraceState;
 import org.eclipse.linuxtools.lttng.state.model.LttngTrapState;
@@ -234,9 +235,15 @@ public class TimeRangeResourceFactory {
                        @Override
                        public String getStateMode(LttngTraceState traceSt) {
                                // Get the resource state mode
-                               String cpuStateMode = traceSt.getCpu_states().get(
-                                               getResourceId())
-                                               .peekFromCpuStack().getInName();
+                           LTTngCPUState cpuState = traceSt.getCpu_states().get(
+                        getResourceId());
+                           
+                               String cpuStateMode = "";
+                               if (cpuState != null) { 
+                                   cpuStateMode = traceSt.getCpu_states().get(
+                                           getResourceId())
+                                           .peekFromCpuStack().getInName();
+                               }
 
                                return cpuStateMode;
                        }