Some more fixes to the CRLOGIC code to be more robust ...

This commit is contained in:
ebner committed 2014-10-10 13:24:05 +02:00
1 parent d5cc43c2d1
commit 86558604b0
2 files changed
+20 -5

No files matched your search

+1 -1
View File
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>ch.psi.fda</groupId>
<artifactId>ch.psi.fda.xscan</artifactId>
<version>2.3.9</version>
<version>2.3.10</version>
<dependencies>
@@ -22,6 +22,8 @@ package ch.psi.fda.core.loops.cr;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.BlockingQueue;
import java.util.logging.Level;
import java.util.logging.Logger;
import com.google.common.eventbus.EventBus;
@@ -37,6 +39,7 @@ import ch.psi.fda.messages.Metadata;
*/
public class ParallelCrlogicStreamMerge {
private static final Logger logger = Logger.getLogger(ParallelCrlogicStreamMerge.class.getName());
private BlockingQueue<Message> primaryQueue;
private BlockingQueue<Message> secondaryQueue;
@@ -98,6 +101,7 @@ public class ParallelCrlogicStreamMerge {
while(true){
// Assumption: the secondary Queue holds at least the data up to the
// timestamp of the primary queue
// TODO this assumption is probably not TRUE and need to be checked for !!!!
Message mess = secondaryQueue.peek();
if(mess instanceof EndOfStreamMessage){
@@ -140,14 +144,25 @@ public class ParallelCrlogicStreamMerge {
}
else{
// No DataMessage
logger.warning("No datamessage received!");
break;
}
}
// Add data to primary data queue message and put it into the out queue
dm.getData().addAll(currData);
dm.setMetadata(metadata);
eventbus.post(dm);
if(currData!=null){
try{
// Add data to primary data queue message and put it into the out queue
dm.getData().addAll(currData);
dm.setMetadata(metadata);
eventbus.post(dm);
}
catch(NullPointerException e){
logger.log(Level.SEVERE, "Discarding message because of some missing data from the scr source", e);
}
}
else{
logger.warning("Discarding message because of missing data from the scr source");
}
}