tmf: Enforce existing sv types when reusing attributes

[deliverable/tracecompass.git] / org.eclipse.linuxtools.tmf.core / src / org / eclipse / linuxtools / tmf / core / statesystem / StateSystem.java

diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/statesystem/StateSystem.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/statesystem/StateSystem.java
index 48764b96d32eb782e0a4787de4e3ddcc8c2d5397..3e8d060bf17d0393dc2542a7e64867422903963d 100644 (file)
--- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/statesystem/StateSystem.java
+++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/statesystem/StateSystem.java
@@ -281,9 +281,13 @@ public class StateSystem {
      *             If the requested time is outside of the trace's range
      * @throws AttributeNotFoundException
      *             If the requested attribute quark is invalid
+     * @throws StateValueTypeException
+     *             If the inserted state value's type does not match what is
+     *             already assigned to this attribute.
      */
     public void modifyAttribute(long t, ITmfStateValue value, int attributeQuark)
-            throws TimeRangeException, AttributeNotFoundException {
+            throws TimeRangeException, AttributeNotFoundException,
+            StateValueTypeException {
         transState.processStateChange(t, value, attributeQuark);
     }
 
@@ -468,8 +472,16 @@ public class StateSystem {
             removeAttribute(t, childNodeQuark);
         }
         /* Nullify ourselves */
-        transState.processStateChange(t, TmfStateValue.nullValue(),
-                attributeQuark);
+        try {
+            transState.processStateChange(t, TmfStateValue.nullValue(),
+                    attributeQuark);
+        } catch (StateValueTypeException e) {
+            /* 
+             * Will not happen since we're inserting null values only, but
+             * poor compiler has no way of knowing this...
+             */
+            e.printStackTrace();
+        }
     }
 
     /**