[seam-commits] Seam SVN: r7206 - trunk/src/jbas5/org/jboss/seam/as5/vfs.
Author: pete.muir(a)jboss.org
Date: 2008-01-23 09:37:16 -0500 (Wed, 23 Jan 2008)
New Revision: 7206
Modified:
trunk/src/jbas5/org/jboss/seam/as5/vfs/VFSScanner.java
Log:
Don't need to check whether trace is enabled when using Seam logging
Modified: trunk/src/jbas5/org/jboss/seam/as5/vfs/VFSScanner.java
===================================================================
--- trunk/src/jbas5/org/jboss/seam/as5/vfs/VFSScanner.java 2008-01-23 14:08:19 UTC (rev
7205)
+++ trunk/src/jbas5/org/jboss/seam/as5/vfs/VFSScanner.java 2008-01-23 14:37:16 UTC (rev
7206)
@@ -58,10 +58,8 @@
*/
protected static VirtualFile getRoot(URL url, int parentDepth) throws IOException
{
- boolean trace = log.isTraceEnabled();
- if (trace)
- log.trace("Root url: " + url);
+ log.trace("Root url: " + url);
String urlString = url.toString();
// TODO - this should go away once we figure out why -exp.war is part of CL
resources
@@ -73,8 +71,8 @@
URL vfsurl = null;
String relative;
File fp = new File(file);
- if (trace)
- log.trace("File: " + fp);
+
+ log.trace("File: " + fp);
if (fp.exists())
{
@@ -99,8 +97,7 @@
}
}
- if (trace)
- log.trace("URL: " + vfsurl + ", relative: " + relative);
+ log.trace("URL: " + vfsurl + ", relative: " + relative);
VirtualFile top = VFS.getRoot(vfsurl);
top = top.getChild(relative);
@@ -112,8 +109,7 @@
parentDepth--;
}
- if (trace)
- log.trace("Top: " + top);
+ log.trace("Top: " + top);
return top;
}
@@ -127,7 +123,7 @@
VirtualFile root = getRoot(dir.toURL(), 0);
if (root != null)
handleRoot(root);
- else if (log.isTraceEnabled())
+ else
log.trace("Null root: " + dir);
}
catch (IOException e)
@@ -150,7 +146,7 @@
VirtualFile root = getRoot(url, resourceName.lastIndexOf('/') >
0 ? 2 : 1);
if (root != null)
handleRoot(root);
- else if (log.isTraceEnabled())
+ else
log.trace("Null root: " + url);
}
}