From 359bcdbe48519207214111a49174a226f5034a70 Mon Sep 17 00:00:00 2001 From: Lukasz Lenart Date: Fri, 22 Mar 2013 09:59:43 +0000 Subject: [PATCH] WW-3988 Changes order of looking for LoggerFactory, first trying to use commons-logging git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1459689 13f79535-47bb-0310-9956-ffa450edef68 --- .../xwork2/util/logging/LoggerFactory.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/LoggerFactory.java b/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/LoggerFactory.java index edc9189bc..b38098bde 100644 --- a/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/LoggerFactory.java +++ b/xwork-core/src/main/java/com/opensymphony/xwork2/util/logging/LoggerFactory.java @@ -60,15 +60,15 @@ public abstract class LoggerFactory { try { if (factory == null) { try { - Class.forName("org.slf4j.LoggerFactory"); - factory = new Slf4jLoggerFactory(); + Class.forName("org.apache.commons.logging.LogFactory"); + factory = new com.opensymphony.xwork2.util.logging.commons.CommonsLoggerFactory(); } catch (ClassNotFoundException ex) { - //slf4j not found try commons LogFactory + //commons-logging not found try slf4j LogFactory try { - Class.forName("org.apache.commons.logging.LogFactory"); - factory = new com.opensymphony.xwork2.util.logging.commons.CommonsLoggerFactory(); + Class.forName("org.slf4j.LoggerFactory"); + factory = new Slf4jLoggerFactory(); } catch (ClassNotFoundException cnfex) { - // commons logging not found, falling back to jdk logging + // slf4j not found, falling back to jdk logging factory = new JdkLoggerFactory(); } }