Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'jetty-9.4.x' into jetty-10.0.x

This commit is contained in:
olivier lamy 2019-04-23 13:01:42 +10:00
parent ad3b2bc4d0 8bacb603a7
commit 0b6c27e276
3 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
LICENSE
View File

@ -1,7 +1,8 @@
This program and the accompanying materials are made available under the
terms of the Eclipse Public License 2.0 which is available at
http://www.eclipse.org/legal/epl-2.0, or the Apache Software License
2.0 which is available at https://www.apache.org/licenses/LICENSE-2.0.
terms of the Eclipse Public License 1.0 which is available at
https://www.eclipse.org/org/documents/epl-1.0/EPL-1.0.txt
or the Apache Software License 2.0 which is available at
https://www.apache.org/licenses/LICENSE-2.0

4
jetty-server/src/test/java/org/eclipse/jetty/server/handler/DefaultHandlerTest.java
View File

@ -89,9 +89,9 @@ public class DefaultHandlerTest
HttpTester.Response response = HttpTester.parseResponse(input);
assertEquals(HttpStatus.NOT_FOUND_404, response.getStatus());
assertEquals("text/html;charset=ISO-8859-1", response.get(HttpHeader.CONTENT_TYPE));
assertEquals("text/html;charset=UTF-8", response.get(HttpHeader.CONTENT_TYPE));
String content = new String(response.getContentBytes(),StandardCharsets.ISO_8859_1);
String content = new String(response.getContentBytes(),StandardCharsets.UTF_8);
assertThat(content,containsString("Contexts known to this server are:"));
assertThat(content,containsString("/foo"));
assertThat(content,containsString("/bar"));

10
tests/test-sessions/test-hazelcast-sessions/src/test/java/org/eclipse/jetty/hazelcast/session/HazelcastSessionDataStoreTest.java
View File

@ -116,6 +116,16 @@ public class HazelcastSessionDataStoreTest extends AbstractSessionDataStoreTest
//to find zombie sessions.
}
public void testStoreObjectAttributes() throws Exception
{
//This test will not work for hazelcast because we can't enable
//HazelcastSessionDataStore.setScavengeZombieSessions, as it's
//too difficult to get the required classes onto the embedded
//hazelcast instance: these classes are required to handle
//the serialization/deserialization that hazelcast performs when querying
//to find zombie sessions.
}
/**
*
* This test deliberately sets the sessionDataMap to null for the