User: andreas
Date: 00/12/08 09:41:31
Modified: src/main/org/jboss/logging Log.java DefaultLog.java
Log:
Fix a problem with the getLog() method on Log class.
Revision Changes Path
1.7 +13 -4 jboss/src/main/org/jboss/logging/Log.java
Index: Log.java
===================================================================
RCS file: /products/cvs/ejboss/jboss/src/main/org/jboss/logging/Log.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Log.java 2000/12/07 18:16:12 1.6
+++ Log.java 2000/12/08 17:41:31 1.7
@@ -17,7 +17,7 @@
*
* @see <related>
* @author Rickard �berg ([EMAIL PROTECTED])
- * @version $Revision: 1.6 $
+ * @version $Revision: 1.7 $
*/
public abstract class Log
{
@@ -75,15 +75,24 @@
public static Log getLog()
{
Stack s = (Stack)currentLog.get();
- return s == null ? defaultLog : (Log)s.peek();
+ if( s == null ) {
+ if( defaultLog == null ) {
+ defaultLog = createLog( "Default" );
+ }
+ return defaultLog;
+ }
+ else {
+ return (Log)s.peek();
+ }
}
public static Log createLog( Object pSource ) {
Log lReturn;
try {
- Class lLog = Class.forName( "org.jboss.logging.DefaultLog" );
+ Class lLog =
Thread.currentThread().getContextClassLoader().loadClass(
"org.jboss.logging.DefaultLog" );
+//AS Class lLog = Class.forName( "org.jboss.logging.DefaultLog" );
lReturn = (Log) lLog.getConstructor( new Class[] {
Object.class } ).newInstance(
- new Object[] { pSource }
+ new Object[] { pSource }
);
}
catch( Exception e ) {
1.2 +1 -4 jboss/src/main/org/jboss/logging/DefaultLog.java
Index: DefaultLog.java
===================================================================
RCS file: /products/cvs/ejboss/jboss/src/main/org/jboss/logging/DefaultLog.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultLog.java 2000/12/07 18:16:12 1.1
+++ DefaultLog.java 2000/12/08 17:41:31 1.2
@@ -17,7 +17,7 @@
*
* @see <related>
* @author Rickard �berg ([EMAIL PROTECTED])
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public class DefaultLog extends Log
{
@@ -26,9 +26,6 @@
// Attributes ----------------------------------------------------
// Static --------------------------------------------------------
- static {
- Log.defaultLog = new DefaultLog();
- }
// Constructors --------------------------------------------------
public DefaultLog()
