From a888855fa2e0290094f96dbc40116d490dfb8e63 Mon Sep 17 00:00:00 2001
From: Matt Sicker <boards@gmail.com>
Date: Sun, 12 Jan 2014 16:42:03 -0600
Subject: [PATCH] Remove dead code.

---
 .../java/org/apache/logging/log4j/spi/LoggerStream.java  |  9 ---------
 .../test/java/org/apache/logging/log4j/LoggerTest.java   |  6 ++++--
 .../org/apache/logging/log4j/spi/LoggerStreamTest.java   | 16 ++++++----------
 3 files changed, 10 insertions(+), 21 deletions(-)

diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/spi/LoggerStream.java b/log4j-api/src/main/java/org/apache/logging/log4j/spi/LoggerStream.java
index 9d76dd2..4e4e72e 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/spi/LoggerStream.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/spi/LoggerStream.java
@@ -269,15 +269,6 @@ public class LoggerStream extends PrintStream {
             }
         }
 
-        private int lastIndexOf(int b) {
-            for (int i = count - 1; i >= 0; --i) {
-                if (buf[i] == b) {
-                    return i;
-                }
-            }
-            return -1;
-        }
-
         @Override
         public synchronized void write(int b) {
             if (b == '\r') {
diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/LoggerTest.java b/log4j-api/src/test/java/org/apache/logging/log4j/LoggerTest.java
index 77435a6..c4700b9 100644
--- a/log4j-api/src/test/java/org/apache/logging/log4j/LoggerTest.java
+++ b/log4j-api/src/test/java/org/apache/logging/log4j/LoggerTest.java
@@ -243,13 +243,15 @@ public class LoggerTest {
         stream.println("Debug message 1");
         stream.print("Debug message 2");
         stream.println();
-        stream.println();
+        stream.println(); // verify blank log message
         stream.print("Debug message 3\n");
-        assertEquals(4, results.size());
+        stream.print("\r\n"); // verify windows EOL works
+        assertEquals(5, results.size());
         assertThat("Incorrect message", results.get(0), startsWith(" DEBUG Debug message 1"));
         assertThat("Incorrect message", results.get(1), startsWith(" DEBUG Debug message 2"));
         assertEquals("Message should be blank-ish", results.get(2), " DEBUG ");
         assertThat("Incorrect message", results.get(3), startsWith(" DEBUG Debug message 3"));
+        assertEquals("Message should be blank-ish", results.get(4), " DEBUG ");
     }
 
     @Test
diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/spi/LoggerStreamTest.java b/log4j-api/src/test/java/org/apache/logging/log4j/spi/LoggerStreamTest.java
index 60fe421..74023c3 100644
--- a/log4j-api/src/test/java/org/apache/logging/log4j/spi/LoggerStreamTest.java
+++ b/log4j-api/src/test/java/org/apache/logging/log4j/spi/LoggerStreamTest.java
@@ -32,10 +32,6 @@ import java.util.List;
 import static org.hamcrest.core.StringStartsWith.startsWith;
 import static org.junit.Assert.*;
 
-/**
- * @author msicker
- * @version 1.0.0
- */
 @RunWith(Parameterized.class)
 public class LoggerStreamTest {
     private List<String> results;
@@ -47,11 +43,11 @@ public class LoggerStreamTest {
     public static Collection<Object[]> data() {
         return Arrays.asList(
                 new Object[][]{
-                        { Level.DEBUG, "debug log string test" },
-                        { Level.INFO, "info log string test" },
-                        { Level.WARN, "DANGER ZONE" },
-                        { Level.ERROR, "MAYDAY! MAYDAY!" },
-                        { Level.FATAL, "ABANDON SHIP!" }
+                        {Level.DEBUG, "debug log string test"},
+                        {Level.INFO, "info log string test"},
+                        {Level.WARN, "DANGER ZONE"},
+                        {Level.ERROR, "MAYDAY! MAYDAY!"},
+                        {Level.FATAL, "ABANDON SHIP!"}
                 }
         );
     }
@@ -111,7 +107,7 @@ public class LoggerStreamTest {
     @Test
     public void testWrite_ByteArray_Offset_Length() throws Exception {
         final byte[] bytes = logMessage.getBytes();
-        int middle = bytes.length/2;
+        int middle = bytes.length / 2;
         int length = bytes.length - middle;
         final String right = new String(bytes, middle, length);
         stream.write(bytes, middle, length);
-- 
1.8.5.2