mcconnell 2002/10/10 00:41:53
Modified: assembly/src/etc kernel.xml
assembly/src/java/org/apache/excalibur/merlin/assembly
DefaultLoggerManager.java
Log:
Corrected a bug in the handling of the default log target.
Revision Changes Path
1.46 +1 -1 jakarta-avalon-excalibur/assembly/src/etc/kernel.xml
Index: kernel.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/src/etc/kernel.xml,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- kernel.xml 15 Sep 2002 02:28:25 -0000 1.45
+++ kernel.xml 10 Oct 2002 07:41:53 -0000 1.46
@@ -47,7 +47,7 @@
-->
<logging priority="INFO" target="default">
- <category name="logging" priority="WARN" />
+ <category name="logging" priority="WARN" />
<target name="kernel">
<file location="kernel.log" />
</target>
1.13 +6 -7
jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/assembly/DefaultLoggerManager.java
Index: DefaultLoggerManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/assembly/DefaultLoggerManager.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- DefaultLoggerManager.java 2 Oct 2002 01:52:15 -0000 1.12
+++ DefaultLoggerManager.java 10 Oct 2002 07:41:53 -0000 1.13
@@ -322,15 +322,14 @@
if( target != null )
{
- final LogTarget logTarget = (LogTarget)m_targets.get( target );
- if( logTarget != null )
+ if( !target.equals("default") )
{
- logger.setLogTargets( new LogTarget[]{logTarget} );
+ final LogTarget logTarget = (LogTarget)m_targets.get( target );
+ if( logTarget != null )
+ {
+ logger.setLogTargets( new LogTarget[]{logTarget} );
+ }
}
- }
- else
- {
- logger.setLogTargets( new LogTarget[]{(LogTarget)m_targets.get(
DEFAULT_TARGET )} );
}
if( notify && getLogger().isInfoEnabled() )
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
