Siphalor/tweed5-commons-logging
1
0
Fork 0
Code Activity

Added catch and retry using class classloader block. This should hopefully address the cases where the TCCL is not set reasonably.

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/logging/trunk@375696 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Robert Burrell Donkin
2006-02-07 20:48:02 +00:00
parent 2178c14018
commit f674577eb8
3 changed files with 128 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
src/java/org/apache/commons/logging/impl/LogFactoryImpl.java
View File

@@ -853,7 +853,41 @@ public class LogFactoryImpl extends LogFactory {
+ " from classloader "
+ objectId(currentCL));
try {
Class c = Class.forName(logAdapterClassName, true, currentCL);
Class c = null;
try {
c = Class.forName(logAdapterClassName, true, currentCL);
} catch (ClassNotFoundException originalClassNotFoundException) {
// The current classloader was unable to find the log adapter
// in this or any ancestor classloader. There's no point in
// trying higher up in the hierarchy in this case..
String msg = "" + originalClassNotFoundException.getMessage();
logDiagnostic(
"The log adapter "
+ logAdapterClassName
+ " is not available via classloader "
+ objectId(currentCL)
+ ": "
+ msg.trim());
try {
// Try the class classloader.
// This may work in cases where the TCCL
// does not contain the code executed or JCL.
// This behaviour indicates that the application
// classloading strategy is not consistent with the
// Java 1.2 classloading guidelines but JCL can
// and so should handle this case.
c = Class.forName(logAdapterClassName);
} catch (ClassNotFoundException secondaryClassNotFoundException) {
// no point continuing: this adapter isn't available
msg = "" + secondaryClassNotFoundException.getMessage();
logDiagnostic(
"The log adapter "
+ logAdapterClassName
+ " is not available via the LogFactoryImpl class classloader: "
+ msg.trim());
break;
}
}
constructor = c.getConstructor(logConstructorSignature);
Object o = constructor.newInstance(params);
@@ -879,19 +913,6 @@ public class LogFactoryImpl extends LogFactory {
// LogConfigurationException if it regards this problem as
// fatal, and just return if not.
handleFlawedHierarchy(currentCL, c);
} catch (ClassNotFoundException e) {
// The current classloader was unable to find the log adapter
// in this or any ancestor classloader. There's no point in
// trying higher up in the hierarchy in this case..
String msg = "" + e.getMessage();
logDiagnostic(
"The log adapter "
+ logAdapterClassName
+ " is not available via classloader "
+ objectId(currentCL)
+ ": "
+ msg.trim());
break;
} catch (NoClassDefFoundError e) {
// We were able to load the adapter but it had references to
// other classes that could not be found. This simply means that

48
src/test/org/apache/commons/logging/tccl/BadTCCLTestCase.java Normal file
View File

@@ -0,0 +1,48 @@
/*
* Copyright 2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.commons.logging.tccl;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.commons.logging.PathableClassLoader;
import org.apache.commons.logging.PathableTestSuite;
import junit.framework.Test;
import junit.framework.TestCase;
/**
* Simulates the case when TCCL is badly set and cannot load JCL.
*/
public class BadTCCLTestCase extends TestCase {
public static Test suite() throws Exception {
PathableClassLoader contextClassLoader = new PathableClassLoader(null);
contextClassLoader.useSystemLoader("junit.");
PathableTestSuite suite = new PathableTestSuite(BadTCCLTestCase.class, contextClassLoader);
return suite;
}
// test methods
/**
* This test just tests that a log implementation can be found
* by the LogFactory.
*/
public void testGetLog() {
Log log = LogFactory.getLog(BadTCCLTestCase.class);
log.debug("Hello, Mum");
}
}

45
src/test/org/apache/commons/logging/tccl/NullTCCLTestCase.java Normal file
View File

@@ -0,0 +1,45 @@
/*
* Copyright 2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.commons.logging.tccl;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.commons.logging.PathableTestSuite;
import junit.framework.Test;
import junit.framework.TestCase;
/**
* Simulates the case when TCCL is set to NULL.
*/
public class NullTCCLTestCase extends TestCase {
public static Test suite() throws Exception {;
PathableTestSuite suite = new PathableTestSuite(NullTCCLTestCase.class, null);
return suite;
}
// test methods
/**
* This test just tests that a log implementation can be found
* by the LogFactory.
*/
public void testGetLog() {
Log log = LogFactory.getLog(NullTCCLTestCase.class);
log.debug("Hello, Mum");
}
}