You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by fs...@apache.org on 2015/02/25 22:14:49 UTC
svn commit: r1662308 - in /tomcat/trunk:
java/org/apache/catalina/valves/PersistentValve.java
test/org/apache/catalina/session/TestPersistentManager.java
Author: fschumacher
Date: Wed Feb 25 21:14:49 2015
New Revision: 1662308
URL: http://svn.apache.org/r1662308
Log:
Don't create a session, if none is needed when using PersistentValve.
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=57637
Modified:
tomcat/trunk/java/org/apache/catalina/valves/PersistentValve.java
tomcat/trunk/test/org/apache/catalina/session/TestPersistentManager.java
Modified: tomcat/trunk/java/org/apache/catalina/valves/PersistentValve.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/PersistentValve.java?rev=1662308&r1=1662307&r2=1662308&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/valves/PersistentValve.java (original)
+++ tomcat/trunk/java/org/apache/catalina/valves/PersistentValve.java Wed Feb 25 21:14:49 2015
@@ -128,7 +128,7 @@ public class PersistentValve extends Val
// HttpSession hsess = hreq.getSession(false);
Session hsess;
try {
- hsess = request.getSessionInternal();
+ hsess = request.getSessionInternal(false);
} catch (Exception ex) {
hsess = null;
}
Modified: tomcat/trunk/test/org/apache/catalina/session/TestPersistentManager.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/session/TestPersistentManager.java?rev=1662308&r1=1662307&r2=1662308&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/session/TestPersistentManager.java (original)
+++ tomcat/trunk/test/org/apache/catalina/session/TestPersistentManager.java Wed Feb 25 21:14:49 2015
@@ -20,13 +20,16 @@ import java.beans.PropertyChangeListener
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import java.util.concurrent.atomic.AtomicInteger;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
import org.junit.After;
import org.junit.Assert;
@@ -38,8 +41,10 @@ import org.apache.catalina.LifecycleExce
import org.apache.catalina.Manager;
import org.apache.catalina.Session;
import org.apache.catalina.Store;
+import org.apache.catalina.core.StandardContext;
import org.apache.catalina.startup.Tomcat;
import org.apache.catalina.startup.TomcatBaseTest;
+import org.apache.catalina.valves.PersistentValve;
public class TestPersistentManager extends TomcatBaseTest {
@@ -94,6 +99,69 @@ public class TestPersistentManager exten
}
@Test
+ public void noSessionCreate_57637() throws IOException, LifecycleException {
+
+ // Setup Tomcat instance
+ Tomcat tomcat = getTomcatInstance();
+
+ // No file system docBase required
+ StandardContext ctx = (StandardContext) tomcat.addContext("", null);
+
+ Tomcat.addServlet(ctx, "DummyServlet", new DummyServlet());
+ ctx.addServletMapping("/dummy", "DummyServlet");
+
+ PersistentManager manager = new PersistentManager();
+ DummyStore store = new DummyStore();
+
+ manager.setStore(store);
+ manager.setMaxIdleBackup(0);
+ manager.setDistributable(true);
+ ctx.setManager(manager);
+ ctx.addValve(new PersistentValve());
+ tomcat.start();
+ Assert.assertEquals(manager.getActiveSessions(), 0);
+ Assert.assertTrue("No sessions managed", manager.getSessionIdsFull().isEmpty());
+ Assert.assertEquals(
+ "NO_SESSION",
+ getUrl(
+ "http://localhost:" + getPort()
+ + "/dummy?no_create_session=true").toString());
+ Assert.assertEquals(manager.getActiveSessions(), 0);
+ Assert.assertTrue("No sessions where created", manager.getSessionIdsFull().isEmpty());
+ }
+
+ @Test
+ public void testCreateSessionAndPassivate() throws IOException, LifecycleException, ClassNotFoundException {
+
+ // Setup Tomcat instance
+ Tomcat tomcat = getTomcatInstance();
+
+ // No file system docBase required
+ StandardContext ctx = (StandardContext) tomcat.addContext("", null);
+
+ Tomcat.addServlet(ctx, "DummyServlet", new DummyServlet());
+ ctx.addServletMapping("/dummy", "DummyServlet");
+
+ PersistentManager manager = new PersistentManager();
+ DummyStore store = new DummyStore();
+
+ manager.setStore(store);
+ manager.setMaxIdleBackup(0);
+ manager.setDistributable(true);
+ ctx.setManager(manager);
+ ctx.addValve(new PersistentValve());
+ tomcat.start();
+ Assert.assertEquals("No active sessions", manager.getActiveSessions(), 0);
+ Assert.assertTrue("No sessions managed", manager.getSessionIdsFull().isEmpty());
+ String sessionId = getUrl(
+ "http://localhost:" + getPort()
+ + "/dummy?no_create_session=false").toString();
+ Assert.assertNotNull("Session is stored", store.load(sessionId));
+ Assert.assertEquals("All sessions are passivated", manager.getActiveSessions(), 0);
+ Assert.assertTrue("One session was created", !manager.getSessionIdsFull().isEmpty());
+ }
+
+ @Test
public void backsUpOnce_56698() throws IOException, LifecycleException,
InterruptedException {
@@ -165,7 +233,15 @@ public class TestPersistentManager exten
@Override
protected void doGet(HttpServletRequest req, HttpServletResponse resp)
throws ServletException, IOException {
- resp.getWriter().print(req.getSession().getId());
+ boolean createSession = !Boolean.parseBoolean(req
+ .getParameter("no_create_session"));
+ HttpSession session = req.getSession(createSession);
+ if (session == null) {
+ resp.getWriter().print("NO_SESSION");
+ } else {
+ String id = session.getId();
+ resp.getWriter().print(id);
+ }
}
}
@@ -173,6 +249,7 @@ public class TestPersistentManager exten
private static class DummyStore implements Store {
private Manager manager;
+ private Map<String, Session> sessions = new HashMap<>();
private List<String> savedIds = new ArrayList<>();
List<String> getSavedIds() {
@@ -200,18 +277,18 @@ public class TestPersistentManager exten
@Override
public String[] keys() throws IOException {
- return null;
+ return new ArrayList<>(sessions.keySet()).toArray(new String[] {});
}
@Override
public Session load(String id) throws ClassNotFoundException,
IOException {
- // TODO Auto-generated method stub
- return null;
+ return sessions.get(id);
}
@Override
public void remove(String id) throws IOException {
+ sessions.remove(id);
}
@Override
@@ -224,8 +301,9 @@ public class TestPersistentManager exten
@Override
public void save(Session session) throws IOException {
+ sessions.put(session.getId(), session);
savedIds.add(session.getId());
}
}
-}
\ No newline at end of file
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org