Merge remote-tracking branch 'origin/jetty-9.4.x'

jetty-server/src/main/config/etc/sessions/session-cache-null.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
+
+<Configure id="Server" class="org.eclipse.jetty.server.Server">
+
+
+  <!-- ===================================================================== -->
+  <!-- Configure a factory for NullSessionCache                              -->
+  <!-- ===================================================================== -->
+  <Call name="addBean">
+   <Arg>
+    <New class="org.eclipse.jetty.server.session.NullSessionCacheFactory">
+     <Set name="saveOnCreate"><Property name="jetty.session.saveOnCreate" default="false" /></Set>
+     <Set name="removeUnloadableSessions"><Property name="jetty.session.removeUnloadableSessions" default="false"/></Set>
+    </New>
+   </Arg>
+  </Call>
+
+</Configure>

jetty-server/src/main/config/modules/session-cache-null.mod

@@ -0,0 +1,15 @@
+[description]
+A trivial SessionCache that does not actually cache sessions.
+
+[provides]
+session-cache
+
+[depends]
+sessions
+
+[xml]
+etc/sessions/session-cache-null.xml
+
+[ini-template]
+#jetty.session.saveOnCreate=false
+#jetty.session.removeUnloadableSessions=false

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

@@ -0,0 +1,86 @@
+//
+//  ========================================================================
+//  Copyright (c) 1995-2016 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;
+
+/**
+ * NullSessionCacheFactory
+ *
+ * Factory for NullSessionCaches.
+ */
+public class NullSessionCacheFactory implements SessionCacheFactory
+{    
+    boolean _saveOnCreate;
+    boolean _removeUnloadableSessions;
+    
+
+    /**
+     * @return the saveOnCreate
+     */
+    public boolean isSaveOnCreate()
+    {
+        return _saveOnCreate;
+    }
+
+
+
+    /**
+     * @param saveOnCreate the saveOnCreate to set
+     */
+    public void setSaveOnCreate(boolean saveOnCreate)
+    {
+        _saveOnCreate = saveOnCreate;
+    }
+
+
+
+    /**
+     * @return the removeUnloadableSessions
+     */
+    public boolean isRemoveUnloadableSessions()
+    {
+        return _removeUnloadableSessions;
+    }
+
+
+
+    /**
+     * @param removeUnloadableSessions the removeUnloadableSessions to set
+     */
+    public void setRemoveUnloadableSessions(boolean removeUnloadableSessions)
+    {
+        _removeUnloadableSessions = removeUnloadableSessions;
+    }
+
+
+
+    /** 
+     * @see org.eclipse.jetty.server.session.SessionCacheFactory#getSessionCache(org.eclipse.jetty.server.session.SessionHandler)
+     */
+    @Override
+    public SessionCache getSessionCache(SessionHandler handler)
+    {
+        NullSessionCache cache = new NullSessionCache(handler);
+        cache.setSaveOnCreate(isSaveOnCreate());
+        cache.setRemoveUnloadableSessions(isRemoveUnloadableSessions());
+        return cache;
+        
+    }
+
+}