From fc59cdb772c38d334f9ae776aab738e5eb81d988 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@lukeshu.com>
Date: Mon, 13 Mar 2017 23:25:51 -0400
Subject: fix iteration

---
 dslog/DseventsReader.java | 12 +++++++-----
 dslog/DslogReader.java    |  6 ++++--
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/dslog/DseventsReader.java b/dslog/DseventsReader.java
index 2914aa1..0bbf4d7 100644
--- a/dslog/DseventsReader.java
+++ b/dslog/DseventsReader.java
@@ -51,11 +51,11 @@ public class DseventsReader implements Versioned, Closeable, Iterator<DseventsRe
 	public Instant startTime() throws IOException {
 		if (m_startTime == null) {
 			switch (version()) {
-			case 0:
+			case 0: // ????-????
 				throw new UnsupportedVersionException("DSEVENTS (TODO)", 0);
-			case 1:
-			case 2:
-			case 3: // 2016-now
+			case 1: // ????-???? 2014
+			case 2: // ????-2015
+			case 3: // 2016-2017
 				m_startTime = Read.LVTimestamp(reader);
 				break;
 			default:
@@ -105,7 +105,9 @@ public class DseventsReader implements Versioned, Closeable, Iterator<DseventsRe
 		if (!hasNext()) {
 			throw new NoSuchElementException();
 		}
-		return m_next;
+		Event ret = m_next;
+		m_next = null;
+		return ret;
 	}
 	public IOException err() {
 		return m_err;
diff --git a/dslog/DslogReader.java b/dslog/DslogReader.java
index cc6f0e9..252d147 100644
--- a/dslog/DslogReader.java
+++ b/dslog/DslogReader.java
@@ -83,7 +83,7 @@ public class DslogReader implements Versioned, Closeable, Iterator<DslogReader.E
 				break;
 			case 2: // ????-2015
 				throw new UnsupportedVersionException("DSLOG (TODO)", 2);
-			case 3: // 2016-now
+			case 3: // 2016-2017
 				m_startTime = Read.LVTimestamp(reader);
 				break;
 			default:
@@ -201,7 +201,9 @@ public class DslogReader implements Versioned, Closeable, Iterator<DslogReader.E
 		if (!hasNext()) {
 			throw new NoSuchElementException();
 		}
-		return m_next;
+		Entry ret = m_next;
+		m_next = null;
+		return ret;
 	}
 	public IOException err() {
 		return m_err;
-- 
cgit v1.2.3