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/14 17:52:50 UTC
svn commit: r1350304 - in
/openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp:
listener/UserSessionListener.java servlet/LogServlet.java
servlet/SessionDataServlet.java
Author: tveronezi
Date: Thu Jun 14 15:52:50 2012
New Revision: 1350304
URL: http://svn.apache.org/viewvc?rev=1350304&view=rev
Log:
https://issues.apache.org/jira/browse/TOMEE-224
* add the "objects" object to the SessionDataServlet results
* close reader before leaving
Modified:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/listener/UserSessionListener.java
openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/servlet/LogServlet.java
openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/servlet/SessionDataServlet.java
Modified: openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/listener/UserSessionListener.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/listener/UserSessionListener.java?rev=1350304&r1=1350303&r2=1350304&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/listener/UserSessionListener.java (original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/listener/UserSessionListener.java Thu Jun 14 15:52:50 2012
@@ -23,9 +23,11 @@ import javax.servlet.http.HttpSession;
import javax.servlet.http.HttpSessionEvent;
import javax.servlet.http.HttpSessionListener;
import java.util.HashMap;
+import java.util.Map;
public class UserSessionListener implements HttpSessionListener {
private static final String CONTEXT_KEY = "UserSessionListener_USER_CONTEXT";
+ private static final String OBJS_KEY = "objects";
@Override
public void sessionCreated(HttpSessionEvent httpSessionEvent) {
@@ -33,7 +35,7 @@ public class UserSessionListener impleme
//this i used by the old tomee gui
//TODO: remove me once the new gui is ready
- httpSessionEvent.getSession().setAttribute("objects", new HashMap<String, Object>());
+ httpSessionEvent.getSession().setAttribute(OBJS_KEY, new HashMap<String, Object>());
}
@Override
@@ -44,4 +46,8 @@ public class UserSessionListener impleme
public static SessionData getServiceContext(HttpSession session) {
return (SessionData) session.getAttribute(CONTEXT_KEY);
}
+
+ public static Map<String, Object> getObjects(HttpSession session) {
+ return (Map<String, Object>) session.getAttribute(OBJS_KEY);
+ }
}
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=1350304&r1=1350303&r2=1350304&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 Thu Jun 14 15:52:50 2012
@@ -80,21 +80,30 @@ public class LogServlet extends HttpServ
private Collection<String> read(final boolean escapeHtml, final File file, final Integer tail) throws IOException {
final Queue<String> lines = new LinkedList<String>();
- final AddLine addLine = new AddLine(lines, tail);
- String line;
- final BufferedReader br = new BufferedReader(new FileReader(file));
+ BufferedReader br = null;
- if (escapeHtml) {
- while ((line = br.readLine()) != null) {
- addLine.add(StringEscapeUtils.escapeHtml4(line));
- }
- } else {
- while ((line = br.readLine()) != null) {
- addLine.add(line);
+ try {
+ br = new BufferedReader(new FileReader(file));
+
+ final AddLine addLine = new AddLine(lines, tail);
+ String line;
+
+ if (escapeHtml) {
+ while ((line = br.readLine()) != null) {
+ addLine.add(StringEscapeUtils.escapeHtml4(line));
+ }
+ } else {
+ while ((line = br.readLine()) != null) {
+ addLine.add(line);
+ }
}
- }
+ } finally {
+ if (br != null) {
+ br.close();
+ }
+ }
return lines;
}
Modified: openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/servlet/SessionDataServlet.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/servlet/SessionDataServlet.java?rev=1350304&r1=1350303&r2=1350304&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/servlet/SessionDataServlet.java (original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/servlet/SessionDataServlet.java Thu Jun 14 15:52:50 2012
@@ -39,6 +39,8 @@ public class SessionDataServlet extends
for (String key : savedObjs.keySet()) {
json.put(key, String.valueOf(savedObjs.get(key)));
}
+
+ savedObjs.putAll(UserSessionListener.getObjects(req.getSession()));
}
});
}