Skip to content

Commit b25d166

Browse files
Cleanup Log4JLogFactory
Removing cruft from the static block that was not required.
1 parent 1602bb2 commit b25d166

File tree

1 file changed

+0
-23
lines changed

1 file changed

+0
-23
lines changed

src/main/java/org/owasp/esapi/logging/log4j/Log4JLogFactory.java

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,11 @@
1414
*/
1515
package org.owasp.esapi.logging.log4j;
1616

17-
import java.io.IOException;
18-
import java.io.InputStream;
19-
import java.io.OutputStream;
20-
import java.io.PrintStream;
2117
import java.util.ArrayList;
2218
import java.util.HashMap;
2319
import java.util.List;
2420
import java.util.Map;
2521

26-
import org.apache.log4j.LogManager;
27-
import org.apache.log4j.PropertyConfigurator;
2822
import org.owasp.esapi.ESAPI;
2923
import org.owasp.esapi.LogFactory;
3024
import org.owasp.esapi.Logger;
@@ -35,7 +29,6 @@
3529
import org.owasp.esapi.logging.cleaning.CompositeLogScrubber;
3630
import org.owasp.esapi.logging.cleaning.LogScrubber;
3731
import org.owasp.esapi.logging.cleaning.NewlineLogScrubber;
38-
import org.owasp.esapi.logging.java.JavaLogFactory;
3932
import org.owasp.esapi.reference.DefaultSecurityConfiguration;
4033
/**
4134
* LogFactory implementation which creates Log4J supporting Loggers.
@@ -74,22 +67,6 @@ public class Log4JLogFactory implements LogFactory {
7467
//LEVEL.OFF not used. If it's off why would we try to log it?
7568

7669
LOG_BRIDGE = new Log4JLogBridgeImpl(Log4J_LOG_APPENDER, Log4J_LOG_SCRUBBER, levelLookup);
77-
78-
try (InputStream stream = Log4JLogFactory.class.getClassLoader().
79-
getResourceAsStream("log4j.xml")) {
80-
PropertyConfigurator.configure(stream);
81-
} catch (IOException ioe) {
82-
System.err.print(new IOException("Failed to load log4j.xml.", ioe));
83-
}
84-
85-
OutputStream nullOutputStream = new OutputStream() {
86-
@Override
87-
public void write(int b) throws IOException {
88-
//No Op
89-
}
90-
};
91-
92-
System.setOut(new PrintStream(nullOutputStream));
9370
}
9471

9572
/**

0 commit comments

Comments
 (0)