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/09 04:09:00 UTC
svn commit: r1348299 - in
/openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp:
SessionData.java servlet/ConsoleServlet.java
Author: tveronezi
Date: Sat Jun 9 02:09:00 2012
New Revision: 1348299
URL: http://svn.apache.org/viewvc?rev=1348299&view=rev
Log:
https://issues.apache.org/jira/browse/TOMEE-225
loading the saved objects
Modified:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/SessionData.java
openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/servlet/ConsoleServlet.java
Modified: openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/SessionData.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/SessionData.java?rev=1348299&r1=1348298&r2=1348299&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/SessionData.java (original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/SessionData.java Sat Jun 9 02:09:00 2012
@@ -17,12 +17,13 @@
package org.apache.tomee.webapp;
+import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
public class SessionData {
- private final Map<String, Object> saved = new HashMap<String, Object>();
+ private final Map<String, Object> saved = Collections.synchronizedMap(new HashMap<String, Object>());
public Map<String, Object> getSaved() {
return saved;
Modified: openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/servlet/ConsoleServlet.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/servlet/ConsoleServlet.java?rev=1348299&r1=1348298&r2=1348299&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/servlet/ConsoleServlet.java (original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/servlet/ConsoleServlet.java Sat Jun 9 02:09:00 2012
@@ -19,6 +19,7 @@ package org.apache.tomee.webapp.servlet;
import org.apache.openejb.util.OpenEJBScripter;
import org.apache.tomee.webapp.JsonExecutor;
+import org.apache.tomee.webapp.listener.UserSessionListener;
import javax.script.Bindings;
import javax.script.SimpleBindings;
@@ -62,8 +63,7 @@ public class ConsoleServlet extends Http
@Override
public void save(String key, Object obj) {
- Map<String, Object> objects = (Map<String, Object>) session.getAttribute("objects");
- objects.put(key, obj);
+ UserSessionListener.getServiceContext(req.getSession()).getSaved().put(key, obj);
}
});