Revision: 1334
http://stripes.svn.sourceforge.net/stripes/?rev=1334&view=rev
Author: bengunter
Date: 2010-11-12 15:34:46 +0000 (Fri, 12 Nov 2010)
Log Message:
-----------
STS-776, STS-773 and STS-775: Limited some unnecessarily verbose log output.
Modified Paths:
--------------
branches/1.5.x/stripes/src/net/sourceforge/stripes/vfs/DefaultVFS.java
Modified: branches/1.5.x/stripes/src/net/sourceforge/stripes/vfs/DefaultVFS.java
===================================================================
--- branches/1.5.x/stripes/src/net/sourceforge/stripes/vfs/DefaultVFS.java
2010-11-12 15:19:15 UTC (rev 1333)
+++ branches/1.5.x/stripes/src/net/sourceforge/stripes/vfs/DefaultVFS.java
2010-11-12 15:34:46 UTC (rev 1334)
@@ -49,8 +49,6 @@
@Override
public List<String> list(URL url, String path) throws IOException {
- log.debug("Listing ", url);
-
InputStream is = null;
try {
List<String> resources = new ArrayList<String>();
@@ -60,6 +58,7 @@
URL jarUrl = findJarForResource(url);
if (jarUrl != null) {
is = jarUrl.openStream();
+ log.debug("Listing ", url);
resources = listResources(new JarInputStream(is), path);
}
else {
@@ -70,6 +69,7 @@
// referenced by the URL isn't actually a JAR
is = url.openStream();
JarInputStream jarInput = new JarInputStream(is);
+ log.debug("Listing ", url);
for (JarEntry entry; (entry =
jarInput.getNextJarEntry()) != null;) {
log.trace("Jar entry: ", entry.getName());
children.add(entry.getName());
@@ -95,7 +95,11 @@
break;
}
}
- children.addAll(lines);
+
+ if (!lines.isEmpty()) {
+ log.debug("Listing ", url);
+ children.addAll(lines);
+ }
}
}
catch (FileNotFoundException e) {
@@ -108,6 +112,7 @@
File file = new File(url.getFile());
log.trace("Listing directory ",
file.getAbsolutePath());
if (file.isDirectory()) {
+ log.debug("Listing ", url);
children = Arrays.asList(file.list());
}
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Centralized Desktop Delivery: Dell and VMware Reference Architecture
Simplifying enterprise desktop deployment and management using
Dell EqualLogic storage and VMware View: A highly scalable, end-to-end
client virtualization framework. Read more!
http://p.sf.net/sfu/dell-eql-dev2dev
_______________________________________________
Stripes-development mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/stripes-development
