Index: trunk/BNC/src/upload/bncrtnetuploadcaster.cpp
===================================================================
--- trunk/BNC/src/upload/bncrtnetuploadcaster.cpp	(revision 9822)
+++ trunk/BNC/src/upload/bncrtnetuploadcaster.cpp	(revision 9823)
@@ -264,5 +264,8 @@
   QMutexLocker locker(&_mutex);
 
-  // Append to internal buffer
+
+
+
+  /* Append to internal buffer
   // -------------------------
   _rtnetStreamBuffer.append(QByteArray(buffer, bufLen));
@@ -304,7 +307,46 @@
 
   if (lines.size() < 2) {
+    emit(newMessage(
+          "bncRtnetUploadCaster: less than 2 lines to decode " + _casterID.toLatin1(), false));
     return;
   }
-
+*/
+
+
+  // Append to internal buffer
+  // -------------------------
+  _rtnetStreamBuffer.append(QByteArray(buffer, bufLen));
+
+  // Select buffer part that contains last epoch
+  // -------------------------------------------
+  QStringList lines;
+  int iEpoBeg = _rtnetStreamBuffer.lastIndexOf('*');   // begin of last epoch
+  if (iEpoBeg == -1) {
+    _rtnetStreamBuffer.clear();
+    return;
+  }
+  _rtnetStreamBuffer = _rtnetStreamBuffer.mid(iEpoBeg);
+
+  int iEpoEnd = _rtnetStreamBuffer.lastIndexOf("EOE"); // end   of last epoch
+  if (iEpoEnd == -1) {
+    return;
+  }
+  else {
+    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);
+  }
   // Read first line (with epoch time)
   // ---------------------------------