reftable: increment pointer *after* reading uint16

This fixes timezone reads out of the reflog.

Change-Id: I126d8742e5e904a074c544514180720466164f7c
Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>

diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/reftable/ReftableTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/reftable/ReftableTest.java
index b67ec563fde64661d801763d90b7fcf0d5d6665b..0e33fa6e76bbb54518b4c669da833b1d5ed223c8 100644 (file)
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/reftable/ReftableTest.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/reftable/ReftableTest.java
@@ -624,6 +624,8 @@ public class ReftableTest {
                        assertEquals(ObjectId.zeroId(), lc.getReflogEntry().getOldId());
                        assertEquals(id(1), lc.getReflogEntry().getNewId());
                        assertEquals(who, lc.getReflogEntry().getWho());
+                       // compare string too, to catch tz differences.
+                       assertEquals(who.toExternalString(), lc.getReflogEntry().getWho().toExternalString());
                        assertEquals(msg, lc.getReflogEntry().getComment());
 
                        assertTrue(lc.next());

diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/reftable/BlockReader.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/reftable/BlockReader.java
index f9e184c99e854cb10127db4a97179d2f9075f941..b66751b94c82613ddad8c027508903585b22d0cf 100644 (file)
--- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/reftable/BlockReader.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/reftable/BlockReader.java
@@ -557,7 +557,9 @@ class BlockReader {
        }
 
        private short readInt16() {
-               return (short) NB.decodeUInt16(buf, ptr += 2);
+               short result =(short) NB.decodeUInt16(buf, ptr);
+               ptr += 2;
+               return result;
        }
 
        private int readVarint32() {