User: ejort
Date: 02/01/05 04:08:54
Modified: src/main/org/jboss/web AbstractWebContainer.java
WebServer.java
Log:
Guarded debug logging
Revision Changes Path
1.11 +26 -9 jboss/src/main/org/jboss/web/AbstractWebContainer.java
Index: AbstractWebContainer.java
===================================================================
RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/web/AbstractWebContainer.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- AbstractWebContainer.java 2001/12/03 17:43:14 1.10
+++ AbstractWebContainer.java 2002/01/05 12:08:54 1.11
@@ -113,7 +113,7 @@
@see org.jboss.security.SecurityAssociation;
@author [EMAIL PROTECTED]
-@version $Revision: 1.10 $
+@version $Revision: 1.11 $
*/
public abstract class AbstractWebContainer extends ServiceMBeanSupport implements
AbstractWebContainerMBean
{
@@ -345,10 +345,12 @@
protected void addEnvEntries(Iterator envEntries, Context envCtx)
throws ClassNotFoundException, NamingException
{
+ boolean debug = log.isDebugEnabled();
while( envEntries.hasNext() )
{
EnvEntryMetaData entry = (EnvEntryMetaData) envEntries.next();
- log.debug("Binding env-entry: "+entry.getName()+" of type:
"+entry.getType()+" to value:"+entry.getValue());
+ if (debug)
+ log.debug("Binding env-entry: "+entry.getName()+" of type:
"+entry.getType()+" to value:"+entry.getValue());
EnvEntryMetaData.bindEnvEntry(envCtx, entry);
}
}
@@ -356,6 +358,8 @@
protected void linkResourceEnvRefs(Iterator resourceEnvRefs, Context envCtx)
throws NamingException
{
+ boolean debug = log.isDebugEnabled();
+
while( resourceEnvRefs.hasNext() )
{
ResourceEnvRefMetaData ref = (ResourceEnvRefMetaData)
resourceEnvRefs.next();
@@ -365,7 +369,8 @@
{
try
{
- log.debug("Binding '"+refName+"' to URL: "+resourceName);
+ if (debug)
+ log.debug("Binding '"+refName+"' to URL: "+resourceName);
URL url = new URL(resourceName);
Util.bind(envCtx, refName, url);
}
@@ -376,7 +381,8 @@
}
else
{
- log.debug("Linking '"+refName+"' to JNDI name: "+resourceName);
+ if (debug)
+ log.debug("Linking '"+refName+"' to JNDI name: "+resourceName);
Util.bind(envCtx, refName, new LinkRef(resourceName));
}
}
@@ -385,6 +391,8 @@
protected void linkResourceRefs(Iterator resourceRefs, Context envCtx)
throws NamingException
{
+ boolean debug = log.isDebugEnabled();
+
while( resourceRefs.hasNext() )
{
ResourceRefMetaData ref = (ResourceRefMetaData) resourceRefs.next();
@@ -394,7 +402,8 @@
{
try
{
- log.debug("Binding '"+refName+"' to URL: "+jndiName);
+ if (debug)
+ log.debug("Binding '"+refName+"' to URL: "+jndiName);
URL url = new URL(jndiName);
Util.bind(envCtx, refName, url);
}
@@ -405,7 +414,8 @@
}
else
{
- log.debug("Linking '"+refName+"' to JNDI name: "+jndiName);
+ if (debug)
+ log.debug("Linking '"+refName+"' to JNDI name: "+jndiName);
Util.bind(envCtx, refName, new LinkRef(jndiName));
}
}
@@ -414,6 +424,8 @@
protected void linkEjbRefs(Iterator ejbRefs, Context envCtx)
throws NamingException
{
+ boolean debug = log.isDebugEnabled();
+
while( ejbRefs.hasNext() )
{
EjbRefMetaData ejb = (EjbRefMetaData) ejbRefs.next();
@@ -422,7 +434,8 @@
String linkName = ejb.getLink();
if( jndiName == null )
jndiName = linkName;
- log.debug("Linking ejb-ref: "+name+" to JNDI name: "+jndiName);
+ if (debug)
+ log.debug("Linking ejb-ref: "+name+" to JNDI name: "+jndiName);
if( jndiName == null )
throw new NamingException("ejb-ref: "+name+", expected jndi-name
in jboss-web.xml");
Util.bind(envCtx, name, new LinkRef(jndiName));
@@ -441,9 +454,12 @@
protected void linkSecurityDomain(String securityDomain, Context envCtx)
throws NamingException
{
+ boolean debug = log.isDebugEnabled();
+
if( securityDomain == null )
{
- log.debug("Binding security/securityMgr to NullSecurityManager");
+ if (debug)
+ log.debug("Binding security/securityMgr to NullSecurityManager");
Object securityMgr = new NullSecurityManager("java:/jaas/null");
Util.bind(envCtx, "security/securityMgr", securityMgr);
Util.bind(envCtx, "security/realmMapping", securityMgr);
@@ -452,7 +468,8 @@
}
else
{
- log.debug("Linking security/securityMgr to JNDI name: "+securityDomain);
+ if (debug)
+ log.debug("Linking security/securityMgr to JNDI name:
"+securityDomain);
Util.bind(envCtx, "security/securityMgr", new LinkRef(securityDomain));
Util.bind(envCtx, "security/realmMapping", new LinkRef(securityDomain));
Util.bind(envCtx, "security/security-domain", new
LinkRef(securityDomain));
1.17 +8 -5 jboss/src/main/org/jboss/web/WebServer.java
Index: WebServer.java
===================================================================
RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/web/WebServer.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- WebServer.java 2001/11/26 03:19:46 1.16
+++ WebServer.java 2002/01/05 12:08:54 1.17
@@ -38,7 +38,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Marc Fleury</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Scott Stark</a>.
- * @version $Revision: 1.16 $
+ * @version $Revision: 1.17 $
*
* Revisions:
*
@@ -158,7 +158,8 @@
try
{
server = new ServerSocket(port, backlog, bindAddress);
- log.debug("Started server: "+server);
+ if (log.isDebugEnabled())
+ log.debug("Started server: "+server);
listen();
}
catch (IOException e)
@@ -355,11 +356,12 @@
}
}
}
- catch (IOException ex)
+ catch (IOException ex)
{
// eat exception (could log error to log file, but
// write out to stdout for now).
- log.debug("error writing response: " + ex.getMessage());
+ if (log.isDebugEnabled())
+ log.debug("error writing response: " + ex.getMessage());
ex.printStackTrace();
}
finally
@@ -413,7 +415,8 @@
protected byte[] getBytes(URL url) throws IOException
{
InputStream in = new BufferedInputStream(url.openStream());
- log.debug("Retrieving "+url.toString());
+ if (log.isDebugEnabled())
+ log.debug("Retrieving "+url.toString());
ByteArrayOutputStream out = new ByteArrayOutputStream();
byte[] tmp = new byte[1024];
int bytes;
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
