Statement unnecessarily nested within else clause.

garydgregory · garydgregory · commit 24df623ed69f · 2016-04-06T00:25:23.000Z
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/io/trunk@1737902 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/main/java/org/apache/commons/io/input/CharSequenceInputStream.java b/src/main/java/org/apache/commons/io/input/CharSequenceInputStream.java
@@ -165,11 +165,10 @@ public int read() throws IOException {
         for (;;) {
             if (this.bbuf.hasRemaining()) {
                 return this.bbuf.get() & 0xFF;
-            } else {
-                fillBuffer();
-                if (!this.bbuf.hasRemaining() && !this.cbuf.hasRemaining()) {
-                    return EOF;
-                }
+            }
+            fillBuffer();
+            if (!this.bbuf.hasRemaining() && !this.cbuf.hasRemaining()) {
+                return EOF;
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -165,11 +165,10 @@ public int read() throws IOException {`
`165`	`165`	`for (;;) {`
`166`	`166`	`if (this.bbuf.hasRemaining()) {`
`167`	`167`	`return this.bbuf.get() & 0xFF;`
`168`		`- } else {`
`169`		`- fillBuffer();`
`170`		`- if (!this.bbuf.hasRemaining() && !this.cbuf.hasRemaining()) {`
`171`		`- return EOF;`
`172`		`- }`
	`168`	`+ }`
	`169`	`+ fillBuffer();`
	`170`	`+ if (!this.bbuf.hasRemaining() && !this.cbuf.hasRemaining()) {`
	`171`	`+ return EOF;`
`173`	`172`	`}`
`174`	`173`	`}`
`175`	`174`	`}`