mcconnell 02/02/23 09:44:50
Modified: apps/enterprise/orb/src/java/org/apache/orb/CORBA/kernel
DefaultLoader.java
Log:
no message
Revision Changes Path
1.7 +14 -7
jakarta-avalon-cornerstone/apps/enterprise/orb/src/java/org/apache/orb/CORBA/kernel/DefaultLoader.java
Index: DefaultLoader.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-cornerstone/apps/enterprise/orb/src/java/org/apache/orb/CORBA/kernel/DefaultLoader.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DefaultLoader.java 23 Feb 2002 13:47:04 -0000 1.6
+++ DefaultLoader.java 23 Feb 2002 17:44:50 -0000 1.7
@@ -1,3 +1,9 @@
+/**
+ * File: CascadingConfiguration.java
+ * License: etc/LICENSE.TXT
+ * Copyright: Copyright (C) The Apache Software Foundation. All rights
reserved.
+ * Copyright: OSM SARL 2001-2002, All Rights Reserved.
+ */
package org.apache.orb.CORBA.kernel;
@@ -42,6 +48,7 @@
import org.openorb.CORBA.kernel.PropertyNotFoundException;
import org.openorb.CORBA.kernel.Configurator;
import org.openorb.CORBA.kernel.ORBConnector;
+import org.openorb.util.Trace;
import org.xml.sax.SAXException;
@@ -115,7 +122,7 @@
//
if( props != null ) m_logger = (Logger) props.get("LOGGER");
- if( m_logger == null ) m_logger = org.openorb.util.Trace.getLogger();
+ if( m_logger == null ) m_logger = Trace.getLogger();
//
// Validate the configuration and build an initializer element
lookup table.
@@ -238,7 +245,7 @@
//
m_orb.enableLogging( m_logger );
- m_logger.debug("loading orb");
+ if( m_logger.isDebugEnabled() ) m_logger.debug("loading orb");
//
// Store the loader
@@ -331,8 +338,8 @@
traceLevel = getIntProperty( "openorb.debug", 0 );
}
- if ( traceLevel != 0 ) org.openorb.util.Trace.setTraceLevel(
traceLevel );
- if ( traceLevel > 4 )
+ if ( traceLevel != 0 ) Trace.setTraceLevel( traceLevel );
+ if ( m_logger.isDebugEnabled() && Trace.isHigh() )
{
m_logger.debug(
"\n----------------------------------------------------------------------------------------"
@@ -598,7 +605,7 @@
ArrayList orbInits = new ArrayList( cls_names.length );
ArrayList openOrbInits = new ArrayList( cls_names.length );
- if( m_logger.isDebugEnabled() ) m_logger.debug(
+ if( m_logger.isDebugEnabled() && Trace.isLow() ) m_logger.debug(
"handling " + cls_names.length + " initializers" );
for ( int i = 0; i < cls_names.length; ++i )
@@ -623,7 +630,7 @@
final String name = config.getAttribute("name", "initializer-"
+ System.identityHashCode( instance ) );
- if( m_logger.isDebugEnabled() ) m_logger.debug(
+ if( m_logger.isDebugEnabled() && Trace.isMedium())
m_logger.debug(
"loading initializer: " + cls_names[i] + " (catagory: " +
name + ")");
//
@@ -879,7 +886,7 @@
*/
public void dispose()
{
- if( m_logger.isDebugEnabled() ) m_logger.debug( "ORB Loader
disposal" );
+ if( m_logger.isDebugEnabled() && Trace.isLow() ) m_logger.debug(
"ORB Loader disposal" );
try
{
if( m_init_info instanceof Disposable )
((Disposable)m_init_info).dispose();
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
