Index: trunk/BNC/src/upload/bncrtnetuploadcaster.cpp
===================================================================
--- trunk/BNC/src/upload/bncrtnetuploadcaster.cpp	(revision 9879)
+++ trunk/BNC/src/upload/bncrtnetuploadcaster.cpp	(revision 9880)
@@ -296,29 +296,27 @@
   }
 
+  QStringList lines;
   // If there is there more than 1 epoch line in the buffer
   while (_rtnetStreamBuffer.count('*') > 1) {
-    cout << "more than 1 epoch in buffer: " << _rtnetStreamBuffer.count('*') << endl;
-    emit(newMessage(QString("bncRtnetUploadCaster: more than 1 epoch in buffer: %1").arg(_rtnetStreamBuffer.count('*')).toLatin1(), false));
-    int nextEpochEnd = _rtnetStreamBuffer.indexOf("EOE");
-    QString rtnetStreamBuffer = _rtnetStreamBuffer.mid(nextEpochEnd);
+    cout << "more than 1 epoch in buffer: " << _rtnetStreamBuffer.count('*') << endl;    emit(newMessage(QString("bncRtnetUploadCaster: more than 1 epoch in buffer: %1").arg(_rtnetStreamBuffer.count('*')).toLatin1(), false));
+    QString rtnetStreamBuffer = _rtnetStreamBuffer;
     int nextEpoch    = rtnetStreamBuffer.indexOf('*');
-    cout << "=============" << endl;
-    cout << "nextEpochEnd: " << nextEpochEnd << endl;
-    cout << "nextEpoch: " << nextEpoch << endl;
-    cout << "iEpoEnd  : " << iEpoEnd   << endl;
+    int nextEpochEnd = rtnetStreamBuffer.indexOf("EOE");
+    _rtnetStreamBuffer = _rtnetStreamBuffer.mid(1);
+    nextEpoch    = rtnetStreamBuffer.indexOf('*');
+    _rtnetStreamBuffer = _rtnetStreamBuffer.mid(nextEpoch);
     if      (nextEpoch != -1 && nextEpoch < iEpoEnd) {
-      _rtnetStreamBuffer = _rtnetStreamBuffer.mid(nextEpoch);
-      cout <<  "next Epoch:\n" << _rtnetStreamBuffer.toStdString().c_str() << endl;
+      rtnetStreamBuffer = rtnetStreamBuffer.mid(nextEpoch);
+      lines = _rtnetStreamBuffer.left(nextEpochEnd).split('\n', QString::SkipEmptyParts);
+      if (lines.size() > 2) {
+        decodeRtnetEpoch(lines);
+      }
     }
     else if (nextEpoch != -1 && nextEpoch >= iEpoEnd) {
       break;
     }
-    else {
-      cout << "_rtnetStreamBuffer: \n" <<  _rtnetStreamBuffer.toStdString().c_str() << endl;
-    }
-    cout << "=============" << endl;
-  }
-
-  QStringList lines = _rtnetStreamBuffer.left(iEpoEnd).split('\n', QString::SkipEmptyParts);
+  }
+
+  lines = _rtnetStreamBuffer.left(iEpoEnd).split('\n', QString::SkipEmptyParts);
 
   _rtnetStreamBuffer = _rtnetStreamBuffer.mid(iEpoEnd + 3);