Fixed termination of scan
This commit is contained in:
@@ -5,6 +5,7 @@ import java.io.File;
|
||||
import com.google.common.eventbus.EventBus;
|
||||
|
||||
import ch.psi.fda.EContainer;
|
||||
import ch.psi.fda.messages.EndOfStreamMessage;
|
||||
import ch.psi.fda.serializer.SerializerTXT;
|
||||
import ch.psi.jcae.ChannelService;
|
||||
|
||||
@@ -15,6 +16,7 @@ public class CdumpEContainer implements EContainer {
|
||||
private final EventBus eventbus;
|
||||
|
||||
private Cdump cdump;
|
||||
private SerializerTXT serializer;
|
||||
|
||||
private volatile boolean running = false;
|
||||
|
||||
@@ -31,7 +33,7 @@ public class CdumpEContainer implements EContainer {
|
||||
File file = new File(edescriptor.getFileName());
|
||||
file.getParentFile().mkdirs(); // Create data base directory
|
||||
|
||||
SerializerTXT serializer = new SerializerTXT(file);
|
||||
serializer = new SerializerTXT(file);
|
||||
serializer.setShowDimensionHeader(false);
|
||||
|
||||
eventbus.register(serializer);
|
||||
@@ -51,8 +53,11 @@ public class CdumpEContainer implements EContainer {
|
||||
|
||||
@Override
|
||||
public void abort() {
|
||||
eventbus.post(new EndOfStreamMessage());
|
||||
cdump.stop();
|
||||
running = false;
|
||||
|
||||
eventbus.unregister(serializer);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -62,8 +67,7 @@ public class CdumpEContainer implements EContainer {
|
||||
|
||||
@Override
|
||||
public void destroy() {
|
||||
cdump.stop();
|
||||
running = false;
|
||||
abort();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user