fix IOException when trying to read after close

Signed-off-by: Markus Barchfeld <markus.barchfeld@gmx.de>
eclipse-emfstore · Jul 20, 2016 · fb10234 · fb10234
1 parent 108b4de
commit fb10234
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/...lipse/emf/emfstore/internal/server/model/versioning/impl/persistent/OperationEmitter.java b/...lipse/emf/emfstore/internal/server/model/versioning/impl/persistent/OperationEmitter.java
@@ -57,6 +57,8 @@ public class OperationEmitter implements Closeable {
 	private int currentOpIndex;
 	private long startOffset;
 
+	private boolean isClosed;
+
 	/**
 	 * Constructor.
 	 *
@@ -71,6 +73,7 @@ public OperationEmitter(Direction direction, File file) {
 		determineOperationOffsets();
 		currentOpIndex = direction == Direction.Forward ? 0 : backwardsOffsets.size() - 1;
 		initReader();
+		isClosed = false;
 	}
 
 	private void determineOperationOffsets() {
@@ -223,6 +226,9 @@ public void run() {
 				}
 			}
 		}).start();
+		if (isClosed) {
+			return Optional.absent();
+		}
 
 		try {
 			return Optional.of(deserialize(pis));
@@ -259,6 +265,7 @@ private AbstractOperation deserialize(final PipedInputStream pis) throws IOExcep
 	 */
 	public void close() {
 		try {
+			isClosed = true;
 			reader.close();
 		} catch (final IOException ex) {
 			ModelUtil.logException(ex);