Fix for bug 385432: Missed events in coalesced requests.

Change-Id: I71eb6782113043c41ad275a0dabb8969dbd6978d

diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/request/TmfCoalescedDataRequest.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/request/TmfCoalescedDataRequest.java
index 4cb93be3f8ace69676bbfea68518fc4cd3f21dc9..3ef4a3792427f0afd547012ced4ee8e086445d56 100644 (file)
--- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/request/TmfCoalescedDataRequest.java
+++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/request/TmfCoalescedDataRequest.java
@@ -218,7 +218,7 @@ public class TmfCoalescedDataRequest<T extends ITmfEvent> extends TmfDataRequest
                // TmfCoalescedDataRequest; extended classes should call
                // the sub-requests handleData().
                if (getClass() == TmfCoalescedDataRequest.class) {
-                   long index = getNbRead();
+                   long index = getIndex() + getNbRead();
                for (ITmfDataRequest<T> request : fRequests) {
                    if (!request.isCompleted()) {
                     if (request.getDataType().isInstance(data)) {

diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/request/TmfCoalescedEventRequest.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/request/TmfCoalescedEventRequest.java
index 42fde555fa6a46bafb16eb0bb6860c170afe1761..a315559670bfce8571f26b6a2c253157be932dc5 100644 (file)
--- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/request/TmfCoalescedEventRequest.java
+++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/request/TmfCoalescedEventRequest.java
@@ -215,7 +215,7 @@ public class TmfCoalescedEventRequest<T extends ITmfEvent> extends TmfCoalescedD
             } else {
                 if (request instanceof TmfEventRequest<?>) {
                     TmfEventRequest<T> req = (TmfEventRequest<T>) request;
-                    if (!req.isCompleted() && (getNbRead() > request.getIndex())) {
+                    if (!req.isCompleted() && (getIndex() + getNbRead() > request.getIndex())) {
                         ITmfTimestamp ts = data.getTimestamp();
                         if (req.getRange().contains(ts)) {
                             if (req.getDataType().isInstance(data)) {