WW-4507 - adjust Tomcat url decoding code to Log4j 2 logging used in Struts

This commit is contained in:
Rene Gielen
2016-01-14 15:24:34 +01:00
parent 72471d7075
commit a89bbe22cd
2 changed files with 6 additions and 6 deletions
@@ -16,8 +16,8 @@
*/
package org.apache.struts2.util.tomcat.buf;
import com.opensymphony.xwork2.util.logging.Logger;
import com.opensymphony.xwork2.util.logging.LoggerFactory;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import java.nio.charset.Charset;
import java.util.ArrayList;
@@ -33,7 +33,7 @@ import java.util.TreeMap;
public class StringCache {
private static final Logger log = LoggerFactory.getLogger(StringCache.class);
private static final Logger log = LogManager.getLogger(StringCache.class);
// ------------------------------------------------------- Static Variables
@@ -16,9 +16,9 @@
*/
package org.apache.struts2.util.tomcat.buf;
import com.opensymphony.xwork2.util.logging.LoggerFactory;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import com.opensymphony.xwork2.util.logging.Logger;
import java.io.CharConversionException;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
@@ -33,7 +33,7 @@ import java.io.UnsupportedEncodingException;
*/
public final class UDecoder {
private static final Logger log = LoggerFactory.getLogger(UDecoder.class);
private static final Logger log = LogManager.getLogger(UDecoder.class);
public static final boolean ALLOW_ENCODED_SLASH =
Boolean.parseBoolean(System.getProperty("org.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH", "false"));