You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by cr...@apache.org on 2002/03/04 01:41:37 UTC
cvs commit: jakarta-commons/logging/src/java/org/apache/commons/logging LogSource.java
craigmcc 02/03/03 16:41:37
Modified: logging/src/java/org/apache/commons/logging LogSource.java
Log:
Make discovery process on LogSource compatible with that used by
LogFactory with respect to system properties.
Revision Changes Path
1.14 +9 -5 jakarta-commons/logging/src/java/org/apache/commons/logging/LogSource.java
Index: LogSource.java
===================================================================
RCS file: /home/cvs/jakarta-commons/logging/src/java/org/apache/commons/logging/LogSource.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- LogSource.java 14 Feb 2002 00:19:03 -0000 1.13
+++ LogSource.java 4 Mar 2002 00:41:37 -0000 1.14
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-commons/logging/src/java/org/apache/commons/logging/LogSource.java,v 1.13 2002/02/14 00:19:03 craigmcc Exp $
- * $Revision: 1.13 $
- * $Date: 2002/02/14 00:19:03 $
+ * $Header: /home/cvs/jakarta-commons/logging/src/java/org/apache/commons/logging/LogSource.java,v 1.14 2002/03/04 00:41:37 craigmcc Exp $
+ * $Revision: 1.14 $
+ * $Date: 2002/03/04 00:41:37 $
*
* ====================================================================
*
@@ -97,7 +97,7 @@
* implementation performs exactly the same algorithm as this class did
*
* @author Rod Waldhoff
- * @version $Id: LogSource.java,v 1.13 2002/02/14 00:19:03 craigmcc Exp $
+ * @version $Id: LogSource.java,v 1.14 2002/03/04 00:41:37 craigmcc Exp $
*/
public class LogSource {
@@ -132,7 +132,8 @@
// Is JDK 1.4 Logging Available?
try {
- if (null != Class.forName("java.util.logging.Logger")) {
+ if ((null != Class.forName("java.util.logging.Logger")) &&
+ (null != Class.forName("org.apache.commons.logging.impl.Jdk14Logger"))) {
jdk14IsAvailable = true;
} else {
jdk14IsAvailable = false;
@@ -145,6 +146,9 @@
String name = null;
try {
name = System.getProperty("org.apache.commons.logging.log");
+ if (name == null) {
+ name = System.getProperty("org.apache.commons.logging.Log");
+ }
} catch (Throwable t) {
}
if (name != null) {
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>