tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Christopher Schultz <ch...@christopherschultz.net>
Subject Re: svn commit: r1662537 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/valves/PersistentValve.java test/org/apache/catalina/session/TestPersistentManager.java webapps/docs/changelog.xml
Date Thu, 26 Feb 2015 21:59:11 GMT
Felix,

On 2/26/15 1:46 PM, fschumacher@apache.org wrote:
> Author: fschumacher
> Date: Thu Feb 26 18:46:17 2015
> New Revision: 1662537
> 
> URL: http://svn.apache.org/r1662537
> Log:
> Don't create a session, if none is needed when using PersistentValve.

Good catch. This could be a real pain in the neck.

-chris

> Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=57637
> 
> Merge r1662308 from /tomcat/trunk
> 
> Modified:
>     tomcat/tc8.0.x/trunk/   (props changed)
>     tomcat/tc8.0.x/trunk/java/org/apache/catalina/valves/PersistentValve.java
>     tomcat/tc8.0.x/trunk/test/org/apache/catalina/session/TestPersistentManager.java
>     tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
> 
> Propchange: tomcat/tc8.0.x/trunk/
> ------------------------------------------------------------------------------
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Thu Feb 26 18:46:17 2015
> @@ -1 +1 @@
> -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,164489
2
>  ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,1655558,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,165
7
>  907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200
> +/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,164489
2
>  ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,1655558,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,165
7
>  907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308
> 
> Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/valves/PersistentValve.java
> URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/valves/PersistentValve.java?rev=1662537&r1=1662536&r2=1662537&view=diff
> ==============================================================================
> --- tomcat/tc8.0.x/trunk/java/org/apache/catalina/valves/PersistentValve.java (original)
> +++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/valves/PersistentValve.java Thu Feb
26 18:46:17 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/tc8.0.x/trunk/test/org/apache/catalina/session/TestPersistentManager.java
> URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/test/org/apache/catalina/session/TestPersistentManager.java?rev=1662537&r1=1662536&r2=1662537&view=diff
> ==============================================================================
> --- tomcat/tc8.0.x/trunk/test/org/apache/catalina/session/TestPersistentManager.java
(original)
> +++ tomcat/tc8.0.x/trunk/test/org/apache/catalina/session/TestPersistentManager.java
Thu Feb 26 18:46:17 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
> +}
> 
> Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
> URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1662537&r1=1662536&r2=1662537&view=diff
> ==============================================================================
> --- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original)
> +++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Thu Feb 26 18:46:17 2015
> @@ -66,6 +66,10 @@
>          <code>ServletContext.getContext(String)</code> to be an exact match
to a
>          path to an existing context. (markt)
>        </fix>
> +      <fix>
> +        <bug>57637</bug>: Do not create unnecessary sessions when using
PersistentValve.
> +        (jboynes/fschumacher)
> +      </fix>
>      </changelog>
>    </subsection>
>    <subsection name="Coyote">
> 
> 
> 
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
> For additional commands, e-mail: dev-help@tomcat.apache.org
> 


Mime
View raw message