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.1' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9.1

This commit is contained in:
Greg Wilkins 2013-11-04 17:41:13 +11:00
parent 36c807c2f3 cafb13ea89
commit 3bb17e5029
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
jetty-server/src/main/java/org/eclipse/jetty/server/session/AbstractSession.java
View File

@ -226,7 +226,6 @@ public abstract class AbstractSession implements AbstractSessionManager.SessionI
@Override
public int getMaxInactiveInterval()
{
checkValid();
return (int)(_maxIdleMs/1000);
}

7
jetty-server/src/test/java/org/eclipse/jetty/server/RequestTest.java
View File

@ -214,10 +214,11 @@ public class RequestTest
@Test
public void testMultiPart() throws Exception
{
final File tmpDir = new File (System.getProperty("java.io.tmpdir"));
final File testTmpDir = new File (tmpDir, "reqtest");
final File testTmpDir = File.createTempFile("reqtest", null);
if (testTmpDir.exists())
testTmpDir.delete();
testTmpDir.mkdir();
testTmpDir.deleteOnExit();
assertTrue(testTmpDir.mkdirs());
assertTrue(testTmpDir.list().length == 0);
ContextHandler contextHandler = new ContextHandler();