From 5091e557f6c01d8e0191d458174613249d1f1631 Mon Sep 17 00:00:00 2001
From: Jonathan Cobb <jonathan@kyuss.org>
Date: Thu, 23 Jan 2020 03:52:28 -0500
Subject: [PATCH] minor cleanups

---
 .../java/org/cobbzilla/util/io/multi/MultiStream.java  | 10 ++++------
 .../org/cobbzilla/util/io/regex/RegexFilterReader.java |  2 +-
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/main/java/org/cobbzilla/util/io/multi/MultiStream.java b/src/main/java/org/cobbzilla/util/io/multi/MultiStream.java
index f4eb0ae..32bb45a 100644
--- a/src/main/java/org/cobbzilla/util/io/multi/MultiStream.java
+++ b/src/main/java/org/cobbzilla/util/io/multi/MultiStream.java
@@ -26,8 +26,6 @@ public class MultiStream extends InputStream {
 
     public MultiStream (InputStream r) { this(r, false); }
 
-    protected int getEndOfStreamMarker() { return 0; }
-
     public void addStream (InputStream in) {
         if (endOfStreams) {
             log.warn("addStream: endOfStreams is true, not adding InputStream");
@@ -42,10 +40,10 @@ public class MultiStream extends InputStream {
     }
 
     @Override public int read() throws IOException {
-        int val = currentStream.read();
+        final int val = currentStream.read();
         if (val == -1) {
             if (streamIndex == streams.size()-1) {
-                return endOfStreams ? -1 : getEndOfStreamMarker();
+                return endOfStreams ? -1 : 0;
             }
             currentStream.close();
             streamIndex++;
@@ -56,10 +54,10 @@ public class MultiStream extends InputStream {
     }
 
     @Override public int read(byte[] buf, int off, int len) throws IOException {
-        int count = currentStream.read(buf, off, len);
+        final int count = currentStream.read(buf, off, len);
         if (count == -1) {
             if (streamIndex == streams.size()-1) {
-                return endOfStreams ? -1 : getEndOfStreamMarker();
+                return endOfStreams ? -1 : 0;
             }
             currentStream.close();
             streamIndex++;
diff --git a/src/main/java/org/cobbzilla/util/io/regex/RegexFilterReader.java b/src/main/java/org/cobbzilla/util/io/regex/RegexFilterReader.java
index c46e542..22f3c05 100644
--- a/src/main/java/org/cobbzilla/util/io/regex/RegexFilterReader.java
+++ b/src/main/java/org/cobbzilla/util/io/regex/RegexFilterReader.java
@@ -76,7 +76,7 @@ public class RegexFilterReader extends BufferedReader {
         boolean eof = false;
         // fill the buffer with the underlying stream
         while (len != buffer.length) {
-            int val = super.read(buffer, len, buffer.length - len);
+            final int val = super.read(buffer, len, buffer.length - len);
             if (val == -1) {
                 eof = true;
                 break;