You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by tv...@apache.org on 2012/06/08 16:18:54 UTC

svn commit: r1348085 - /openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/servlet/LogServlet.java

Author: tveronezi
Date: Fri Jun  8 14:18:53 2012
New Revision: 1348085

URL: http://svn.apache.org/viewvc?rev=1348085&view=rev
Log:
https://issues.apache.org/jira/browse/TOMEE-205
* load only those files that have something to say.

Modified:
    openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/servlet/LogServlet.java

Modified: openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/servlet/LogServlet.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/servlet/LogServlet.java?rev=1348085&r1=1348084&r2=1348085&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/servlet/LogServlet.java (original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/servlet/LogServlet.java Fri Jun  8 14:18:53 2012
@@ -40,7 +40,16 @@ public class LogServlet extends HttpServ
             @Override
             public void call(Map<String, Object> json) throws Exception {
                 final File logFolder = new File(System.getProperty("catalina.base"), "logs");
-                json.put("files", logFolder.list());
+
+                final File[] files = logFolder.listFiles();
+                final Set<String> names = new TreeSet<String>();
+                for (File file : files) {
+                    if (file.length() > 0) {
+                        names.add(file.getName());
+                    }
+                }
+
+                json.put("files", names);
 
                 final String loadFileName = req.getParameter("file");
                 if (loadFileName != null) {