Fix endless loop in Resources view when trace is disposed

Change-Id: Ia030dd809de82af07eff8e7de78f0eb45e6c2b2a
Reviewed-on: https://git.eclipse.org/r/9361
Reviewed-by: Bernd Hufmann <bhufmann@gmail.com>
IP-Clean: Bernd Hufmann <bhufmann@gmail.com>
Tested-by: Bernd Hufmann <bhufmann@gmail.com>
Tested-by: Hudson CI

diff --git a/org.eclipse.linuxtools.lttng2.kernel.ui/src/org/eclipse/linuxtools/internal/lttng2/kernel/ui/views/resources/ResourcesPresentationProvider.java b/org.eclipse.linuxtools.lttng2.kernel.ui/src/org/eclipse/linuxtools/internal/lttng2/kernel/ui/views/resources/ResourcesPresentationProvider.java
index d611ef26d4a0841d36a29f47a80c9cce40fc614c..db38b16c7833079fa78ffc5f18433c9730171493 100644 (file)
--- a/org.eclipse.linuxtools.lttng2.kernel.ui/src/org/eclipse/linuxtools/internal/lttng2/kernel/ui/views/resources/ResourcesPresentationProvider.java
+++ b/org.eclipse.linuxtools.lttng2.kernel.ui/src/org/eclipse/linuxtools/internal/lttng2/kernel/ui/views/resources/ResourcesPresentationProvider.java
@@ -303,8 +303,8 @@ public class ResourcesPresentationProvider extends TimeGraphPresentationProvider
         ResourcesEntry entry = (ResourcesEntry) event.getEntry();
         ITmfStateSystem ss = entry.getTrace().getStateSystem(CtfKernelTrace.STATE_ID);
         long time = event.getTime();
-        while (time < event.getTime() + event.getDuration()) {
-            try {
+        try {
+            while (time < event.getTime() + event.getDuration()) {
                 int cpuQuark = entry.getQuark();
                 int currentThreadQuark = ss.getQuarkRelative(cpuQuark, Attributes.CURRENT_THREAD);
                 ITmfStateInterval tidInterval = ss.querySingleState(time, currentThreadQuark);
@@ -352,15 +352,15 @@ public class ResourcesPresentationProvider extends TimeGraphPresentationProvider
                         gc.drawLine(x, bounds.y + 1, x, bounds.y + bounds.height - 2);
                     }
                 }
-            } catch (AttributeNotFoundException e) {
-                e.printStackTrace();
-            } catch (TimeRangeException e) {
-                e.printStackTrace();
-            } catch (StateValueTypeException e) {
-                e.printStackTrace();
-            } catch (StateSystemDisposedException e) {
-                /* Ignored */
             }
+        } catch (AttributeNotFoundException e) {
+            e.printStackTrace();
+        } catch (TimeRangeException e) {
+            e.printStackTrace();
+        } catch (StateValueTypeException e) {
+            e.printStackTrace();
+        } catch (StateSystemDisposedException e) {
+            /* Ignored */
         }
     }