From 330a0414f01970ee6a76697252dea61bf2bf01d9 Mon Sep 17 00:00:00 2001
From: Harald Kuhr <harald.kuhr@gmail.com>
Date: Fri, 10 Jul 2020 22:26:12 +0200
Subject: [PATCH] Fix JPEG tests

---
 .../twelvemonkeys/imageio/plugins/jpeg/JPEGImageReader.java  | 1 +
 .../imageio/plugins/jpeg/JPEGImageReaderTest.java            | 5 ++---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/imageio/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGImageReader.java b/imageio/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGImageReader.java
index 48b82388..3ca27287 100644
--- a/imageio/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGImageReader.java
+++ b/imageio/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGImageReader.java
@@ -718,6 +718,7 @@ public final class JPEGImageReader extends ImageReaderBase {
         }
 
         if (imageIndex == currentStreamIndex) {
+            initHeader();
             return;
         }
 
diff --git a/imageio/imageio-jpeg/src/test/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGImageReaderTest.java b/imageio/imageio-jpeg/src/test/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGImageReaderTest.java
index a0344b57..cea0b4f3 100644
--- a/imageio/imageio-jpeg/src/test/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGImageReaderTest.java
+++ b/imageio/imageio-jpeg/src/test/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGImageReaderTest.java
@@ -32,7 +32,6 @@ package com.twelvemonkeys.imageio.plugins.jpeg;
 
 import com.twelvemonkeys.imageio.util.ImageReaderAbstractTest;
 import com.twelvemonkeys.lang.StringUtil;
-import com.twelvemonkeys.xml.XMLSerializer;
 import org.hamcrest.core.IsInstanceOf;
 import org.junit.Test;
 import org.mockito.internal.matchers.GreaterThan;
@@ -1383,8 +1382,8 @@ public class JPEGImageReaderTest extends ImageReaderAbstractTest<JPEGImageReader
         // Assume that the aspect ratio is 1 if both x/y density is 0.
         IIOMetadataNode tree = (IIOMetadataNode) imageMetadata.getAsTree(IIOMetadataFormatImpl.standardMetadataFormatName);
 
-        new XMLSerializer(System.out, System.getProperty("file.encoding")).serialize(imageMetadata.getAsTree(imageMetadata.getNativeMetadataFormatName()), false);
-        new XMLSerializer(System.out, System.getProperty("file.encoding")).serialize(tree, false);
+//        new XMLSerializer(System.out, System.getProperty("file.encoding")).serialize(imageMetadata.getAsTree(imageMetadata.getNativeMetadataFormatName()), false);
+//        new XMLSerializer(System.out, System.getProperty("file.encoding")).serialize(tree, false);
         NodeList dimensions = tree.getElementsByTagName("Dimension");
         assertEquals(1, dimensions.getLength());
         assertEquals("PixelAspectRatio", dimensions.item(0).getFirstChild().getNodeName());