Fix a bug in writingDocument where it was failing to roll.

src/main/java/net/openhft/chronicle/queue/ChronicleReader.java

@@ -37,7 +37,7 @@
 public enum ChronicleReader {
     ;
 
-    public static void main(String... args) throws IOException, InterruptedException {
+    public static void main(String... args) throws IOException {
         if (args.length < 1) {
             System.err.println("Usage: java " + ChronicleReader.class.getName() + " {chronicle-base-path} {regex} [from-index]");
             System.exit(-1);
@@ -49,7 +49,7 @@ public static void main(String... args) throws IOException, InterruptedException
         tailFileFrom(basePath, regex, index, false);
     }
 
-    public static void tailFileFrom(String basePath, String regex, long index, boolean stopAtEnd) throws IOException {
+    public static void tailFileFrom(String basePath, String regex, long index, boolean stopAtEnd) {
         ChronicleQueue ic = SingleChronicleQueueBuilder.binary(new File(basePath)).build();
         ExcerptTailer tailer = ic.createTailer();
         if (index > 0) {

src/main/java/net/openhft/chronicle/queue/ExcerptAppender.java

@@ -110,7 +110,7 @@ default <T> MethodWriterBuilder<T> methodWriterBuilder(Class<T> tClass) {
     /**
      * Write a Map as a marshallable
      */
-    default void writeMap(Map<String, Object> map) {
+    default void writeMap(Map<String, ?> map) {
         QueueInternal.writeMap(this, map);
     }
 }

src/main/java/net/openhft/chronicle/queue/QueueInternal.java

@@ -47,10 +47,10 @@ static Map<String, Object> readMap(ExcerptTailer tailer) {
 
     }
 
-    static void writeMap(ExcerptAppender appender, Map<String, Object> map) {
+    static void writeMap(ExcerptAppender appender, Map<String, ?> map) {
         try (DocumentContext context = appender.writingDocument()) {
             Wire wire = context.wire();
-            for (Map.Entry<String, Object> entry : map.entrySet()) {
+            for (Map.Entry<String, ?> entry : map.entrySet()) {
                 wire.writeEventName(entry.getKey()).object(entry.getValue());
             }
         }

src/main/java/net/openhft/chronicle/queue/impl/single/SingleChronicleQueueExcerpts.java

@@ -128,7 +128,12 @@ public Wire wire() {
 
         @Override
         public DocumentContext writingDocument() {
+            assert checkAppendingThread();
             try {
+                int cycle = queue.cycle();
+                if (this.cycle != cycle)
+                    rollCycleTo(cycle);
+
                 position = wire.writeHeader(queue.timeoutMS, TimeUnit.MILLISECONDS);
                 metaData = false;
             } catch (TimeoutException e) {
@@ -157,6 +162,8 @@ public void close() {
                 store.writePosition(position);
             } catch (StreamCorruptedException e) {
                 throw new IllegalStateException(e);
+            } finally {
+                assert resetAppendingThread();
             }
         }
 
@@ -296,9 +303,13 @@ private <T> void append2(int length, WireWriter<T> wireWriter, T writer) throws
 
         private boolean checkAppendingThread() {
             Thread appendingThread = this.appendingThread;
-            if (appendingThread != null)
-                throw new IllegalStateException("Attempting to use Appneder in " + Thread.currentThread() + " while used by " + appendingThread);
-            this.appendingThread = Thread.currentThread();
+            Thread currentThread = Thread.currentThread();
+            if (appendingThread != null) {
+                if (appendingThread == currentThread)
+                    throw new IllegalStateException("Nested blocks of writingDocument() not supported");
+                throw new IllegalStateException("Attempting to use Appender in " + currentThread + " while used by " + appendingThread);
+            }
+            this.appendingThread = currentThread;
             return true;
         }
 
@@ -350,20 +361,12 @@ public String toString() {
 
         @Override
         public boolean readDocument(@NotNull final ReadMarshallable marshaller) {
-            try {
-                return read(marshaller, ReadMarshallable::readMarshallable, queue.timeoutMS);
-            } catch (TimeoutException e) {
-                return false;
-            }
+            return read(marshaller, ReadMarshallable::readMarshallable);
         }
 
         @Override
         public boolean readBytes(@NotNull final Bytes using) {
-            try {
-                return read(using, (t, w) -> t.write(w.bytes()), queue.timeoutMS);
-            } catch (TimeoutException e) {
-                return false;
-            }
+            return read(using, (t, w) -> t.write(w.bytes()));
         }
 
         @Override
@@ -384,12 +387,9 @@ public String readText() {
 
         @Nullable
         public boolean readText(StringBuilder sb) {
-            try {
-                if (read(sb, (t, w) ->
-                        w.bytes().parseUtf8(sb, (int) w.bytes().readRemaining()), queue.timeoutMS))
-                    return true;
-            } catch (TimeoutException e) {
-            }
+            if (read(sb, (t, w) ->
+                    w.bytes().parseUtf8(sb, (int) w.bytes().readRemaining())))
+                return true;
             sb.setLength(0);
             sb.append("No message");
             return false;
@@ -454,11 +454,7 @@ private boolean next(boolean includeMetaData) throws TimeoutException {
 
         @Override
         public boolean readBytes(@NotNull final ReadBytesMarshallable using) {
-            try {
-                return read(using, (t, w) -> t.readMarshallable(w.bytes()), queue.timeoutMS);
-            } catch (TimeoutException e) {
-                return false;
-            }
+            return read(using, (t, w) -> t.readMarshallable(w.bytes()));
         }
 
         /**
@@ -555,7 +551,7 @@ public RollingChronicleQueue queue() {
             return queue;
         }
 
-        private <T> boolean read(@NotNull final T t, @NotNull final BiConsumer<T, Wire> c, long timeoutMS) throws TimeoutException {
+        private <T> boolean read(@NotNull final T t, @NotNull final BiConsumer<T, Wire> c) {
             if (this.store == null) {
                 toStart();
                 if (this.store == null) return false;