diff --git a/persistence/binary/src/main/java/org/eclipse/serializer/persistence/binary/types/Binary.java b/persistence/binary/src/main/java/org/eclipse/serializer/persistence/binary/types/Binary.java index ca5ece63..36c252d2 100644 --- a/persistence/binary/src/main/java/org/eclipse/serializer/persistence/binary/types/Binary.java +++ b/persistence/binary/src/main/java/org/eclipse/serializer/persistence/binary/types/Binary.java @@ -2096,9 +2096,10 @@ private static void validatePostIterationState( // (19.03.2019 TM)NOTE: added "|| iterator.hasNext()" check if(address != elementsBinaryBound || iterator.hasNext()) { + final long iteratedCount = elementCount - (elementsBinaryBound - address) / entryLength; throw new BinaryPersistenceException( "Inconsistent element count: specified " + elementCount - + " vs. iterated " + elementsBinaryBound / entryLength + + " vs. iterated " + (iterator.hasNext() ? "more than " + iteratedCount : iteratedCount) ); } }