345268 JDBCSessionManager does not work with maxInactiveInterval = -1

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3461 7e9141cc-0065-0410-87d8-b60c137991c4

VERSION.txt

@@ -1,6 +1,7 @@
 jetty-7.4.4-SNAPSHOT
  + JETTY-1380 Jetty Rewrite example does not work in Hightide
  + 308851 Converted all jetty-client module tests to JUnit 4
+ + 345268 JDBCSessionManager does not work with maxInactiveInterval = -1
  + 351039 Forward dispatch should retain locale
 
 jetty-7.4.3.v20110701 01 July 2011

jetty-server/src/main/java/org/eclipse/jetty/server/session/JDBCSessionManager.java

@@ -528,8 +528,8 @@ public class JDBCSessionManager extends AbstractSessionManager
                 {
                     if (!data.getLastNode().equals(getIdManager().getWorkerName()) || session==null)
                     {
-                        //if the session in the database has not already expired
-                        if (data._expiryTime > now)
+                        //if the session has no expiry, or it is not already expired
+                        if (data._expiryTime <= 0 || data._expiryTime > now)
                         {
                             Log.debug("getSession("+idInCluster+"): lastNode="+data.getLastNode()+" thisNode="+getIdManager().getWorkerName());
                             data.setLastNode(getIdManager().getWorkerName());
@@ -541,6 +541,9 @@ public class JDBCSessionManager extends AbstractSessionManager
                             //the _dirty flag?
                             updateSessionNode(data);
                         }
+                        else
+                            if (Log.isDebugEnabled()) Log.debug("getSession("+idInCluster+"): Session has expired");
+                        
                     }
                     else
                         if (Log.isDebugEnabled()) Log.debug("getSession("+idInCluster+"): Session not stale "+session._data);

tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/MaxInactiveMigrationTest.java

@@ -0,0 +1,141 @@
+// ========================================================================
+// Copyright 2011 Mort Bay Consulting Pty. Ltd.
+// ------------------------------------------------------------------------
+// All rights reserved. This program and the accompanying materials
+// are made available under the terms of the Eclipse Public License v1.0
+// and Apache License v2.0 which accompanies this distribution.
+// The Eclipse Public License is available at
+// http://www.eclipse.org/legal/epl-v10.html
+// The Apache License v2.0 is available at
+// http://www.opensource.org/licenses/apache2.0.php
+// You may elect to redistribute this code under either of these licenses.
+// ========================================================================
+
+package org.eclipse.jetty.server.session;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.sql.DriverManager;
+import java.sql.SQLException;
+
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
+import org.eclipse.jetty.client.ContentExchange;
+import org.eclipse.jetty.client.HttpClient;
+import org.eclipse.jetty.http.HttpMethods;
+import org.eclipse.jetty.servlet.ServletContextHandler;
+import org.eclipse.jetty.util.log.Log;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+
+/**
+ * MaxInactiveMigrationTest
+ *
+ * Test
+ */
+public class MaxInactiveMigrationTest
+{      
+    private JdbcTestServer testServer1;
+    private JdbcTestServer testServer2;
+    private HttpClient client;
+    private String sessionCookie;
+
+    @Test
+    public void testFailover() throws Exception {
+        String response1 = sendRequest( testServer1 );
+        String response2 = sendRequest( testServer2 );
+
+        assertEquals( "Hello World 1", response1 );
+        assertEquals( "Hello World 2", response2 );
+    }
+
+    @Before
+    public void setUp() throws Exception {
+        testServer1 = new JdbcTestServer(0, -1, 2);
+        testServer2 = new JdbcTestServer(0, -1, 2);
+        ServletContextHandler context = testServer1.addContext("");
+        context.addServlet(TestServlet.class, "/test");
+        ServletContextHandler context2 = testServer2.addContext("");
+        context2.addServlet(TestServlet.class, "/test");
+        testServer1.start();
+        testServer2.start();
+        client = new HttpClient();
+        client.setConnectorType(HttpClient.CONNECTOR_SOCKET);
+        client.start();
+    }
+
+    @After
+    public void tearDown() throws Exception {
+
+        testServer1.stop();
+        testServer2.stop();
+        client.stop();
+        try 
+        {
+            DriverManager.getConnection( "jdbc:derby:sessions;shutdown=true" );
+        } 
+        catch( SQLException expected ) 
+        {
+        }
+    }
+
+
+
+    private String sendRequest( JdbcTestServer server ) throws Exception {
+
+        int port=server.getPort();
+
+        //Log.getLog().setDebugEnabled(true);
+        
+        ContentExchange exchange1 = new ContentExchange(true);
+        exchange1.setMethod(HttpMethods.GET);
+        exchange1.setURL("http://localhost:" + port + "" + "/test");
+        if (sessionCookie != null)
+            exchange1.getRequestFields().add("Cookie", sessionCookie);
+        client.send(exchange1);
+        exchange1.waitForDone();
+        assertEquals(HttpServletResponse.SC_OK, exchange1.getResponseStatus());
+
+        sessionCookie = exchange1.getResponseFields().getStringField("Set-Cookie");
+        assertTrue( sessionCookie != null );
+        // Mangle the cookie, replacing Path with $Path, etc.
+        sessionCookie = sessionCookie.replaceFirst("(\\W)(P|p)ath=", "$1\\$Path=");
+
+        return exchange1.getResponseContent();
+    }
+
+
+
+    public static class TestServlet extends HttpServlet {
+        private static final long serialVersionUID = 1L;
+        private static final String ATTR_COUNTER = "counter";
+
+        protected void doGet( HttpServletRequest request, HttpServletResponse response )
+        throws IOException
+        {
+            HttpSession session = request.getSession( true );
+            Integer counter = ( Integer )session.getAttribute( ATTR_COUNTER );
+            if( counter == null ) {
+                counter = new Integer( 0 );
+            }
+            counter = new Integer( counter.intValue() + 1 );
+            session.setAttribute( ATTR_COUNTER, counter );
+            PrintWriter writer = response.getWriter();
+            writer.write( "Hello World " + counter.intValue() );
+            writer.flush();
+        }
+
+        public String getServletInfo() {
+            return "Test Servlet";
+        }
+    }
+
+}