You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2012/06/08 19:09:10 UTC
svn commit: r1348154 -
/openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/servlet/LogServlet.java
Author: rmannibucau
Date: Fri Jun 8 17:09:10 2012
New Revision: 1348154
URL: http://svn.apache.org/viewvc?rev=1348154&view=rev
Log:
commons-lang3 instead of 2 + npe checking
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=1348154&r1=1348153&r2=1348154&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 17:09:10 2012
@@ -17,7 +17,7 @@
package org.apache.tomee.webapp.servlet;
-import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.commons.lang3.StringEscapeUtils;
import org.apache.tomee.webapp.JsonExecutor;
import javax.servlet.ServletException;
@@ -43,9 +43,11 @@ public class LogServlet extends HttpServ
final File[] files = logFolder.listFiles();
final Set<String> names = new TreeSet<String>();
- for (File file : files) {
- if (file.length() > 0) {
- names.add(file.getName());
+ if (files != null) {
+ for (File file : files) {
+ if (file.length() > 0) {
+ names.add(file.getName());
+ }
}
}
@@ -85,7 +87,7 @@ public class LogServlet extends HttpServ
if (escapeHtml) {
while ((line = br.readLine()) != null) {
- addLine.add(StringEscapeUtils.escapeHtml(line));
+ addLine.add(StringEscapeUtils.escapeHtml4(line));
}
} else {
while ((line = br.readLine()) != null) {