Index: trunk/BNC/src/upload/bncrtnetuploadcaster.cpp
===================================================================
--- trunk/BNC/src/upload/bncrtnetuploadcaster.cpp	(revision 9860)
+++ trunk/BNC/src/upload/bncrtnetuploadcaster.cpp	(revision 9861)
@@ -274,46 +274,29 @@
   if (iEpoBeg == -1) {
     _rtnetStreamBuffer.clear();
-    emit(newMessage(
-          "bncRtnetUploadCaster: no Epoch line found " + _casterID.toLatin1(), false));
+    emit(newMessage("bncRtnetUploadCaster: no Epoch line found " + _casterID.toLatin1(), false));
     return;
   }
-
-  int iEpoBegEarlier = _rtnetStreamBuffer.indexOf('*');
-  if (iEpoBegEarlier != -1 && iEpoBegEarlier < iEpoBeg) { // are there two epoch lines in buffer?
-    _rtnetStreamBuffer = _rtnetStreamBuffer.mid(iEpoBegEarlier);
+  _rtnetStreamBuffer = _rtnetStreamBuffer.mid(iEpoBeg);
+
+  int iEpoEnd = _rtnetStreamBuffer.lastIndexOf("EOE"); // end   of last epoch
+  if (iEpoEnd == -1) {
+    emit(newMessage("bncRtnetUploadCaster: no EOE found " + _casterID.toLatin1(), false));
+    return;
   }
   else {
-    _rtnetStreamBuffer = _rtnetStreamBuffer.mid(iEpoBeg);
-  }
-
-  int iEpoEnd = _rtnetStreamBuffer.lastIndexOf("EOE"); // end of last epoch
-  if (iEpoEnd == -1) {
-    _rtnetStreamBuffer.clear();
-    emit(newMessage(
-          "bncRtnetUploadCaster: no EOE found " + _casterID.toLatin1(), false));
+    lines = _rtnetStreamBuffer.left(iEpoEnd).split('\n', QString::SkipEmptyParts);
+    _rtnetStreamBuffer = _rtnetStreamBuffer.mid(iEpoEnd+3);
+  }
+
+  if (lines.size() < 2) {
+      emit(newMessage("bncRtnetUploadCaster: less than 2 lines to decode " + _casterID.toLatin1(), false));
     return;
   }
 
-  while (_rtnetStreamBuffer.count('*') > 1) { // is there more than 1 epoch line in buffer?
-    emit(newMessage(
-          "bncRtnetUploadCaster: more than 1 epoch line in buffer " + _rtnetStreamBuffer.count('*'), false));
-    QString rtnetStreamBuffer = _rtnetStreamBuffer.mid(1);
-    int nextEpoch = rtnetStreamBuffer.indexOf('*');
-    if      (nextEpoch != -1 && nextEpoch < iEpoEnd) {
-      _rtnetStreamBuffer = _rtnetStreamBuffer.mid(nextEpoch);
-    }
-    else if (nextEpoch != -1 && nextEpoch >= iEpoEnd) {
-      break;
-    }
-  }
-
-  lines = _rtnetStreamBuffer.left(iEpoEnd).split('\n', QString::SkipEmptyParts);
-
-  _rtnetStreamBuffer = _rtnetStreamBuffer.mid(iEpoEnd + 3);
-
-  if (lines.size() < 2) {
-    emit(newMessage(
-          "bncRtnetUploadCaster: less than 2 lines to decode " + _casterID.toLatin1(), false));
-    return;
+  // Keep the last unfinished line in buffer
+  // ---------------------------------------
+  int iLastEOL = _rtnetStreamBuffer.lastIndexOf('\n');
+  if (iLastEOL != -1) {
+    _rtnetStreamBuffer = _rtnetStreamBuffer.mid(iLastEOL+1);
   }