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

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

This commit is contained in:
Jan Bartel 2016-07-13 15:32:58 +10:00
parent 68f57cf3e8 6628a42d5d
commit 700d051587
3 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jetty-http2/http2-alpn-tests/src/test/java/org/eclipse/jetty/http2/alpn/tests/ALPNNegotiationTest.java
View File

@ -30,8 +30,8 @@ import java.util.Arrays;
import java.util.List; import java.util.List;
import javax.net.ssl.SSLContext; import javax.net.ssl.SSLContext;
import javax.net.ssl.SSLEngine;
import javax.net.ssl.SSLSocket; import javax.net.ssl.SSLSocket;
import javax.net.ssl.SSLEngine;
import org.eclipse.jetty.alpn.ALPN; import org.eclipse.jetty.alpn.ALPN;
import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.BufferUtil;

20
jetty-http2/http2-client/src/test/java/org/eclipse/jetty/http2/client/IdleTimeoutTest.java
View File

@ -95,9 +95,7 @@ public class IdleTimeoutTest extends AbstractTest
} }
}, new Stream.Listener.Adapter()); }, new Stream.Listener.Adapter());
Assert.assertTrue(latch.await(2 * idleTimeout, TimeUnit.MILLISECONDS)); Assert.assertTrue(latch.await(5 * idleTimeout, TimeUnit.MILLISECONDS));
sleep(1000);
} }
@Test @Test
@ -137,7 +135,7 @@ public class IdleTimeoutTest extends AbstractTest
} }
}, new Stream.Listener.Adapter()); }, new Stream.Listener.Adapter());
Assert.assertTrue(latch.await(2 * idleTimeout, TimeUnit.MILLISECONDS)); Assert.assertTrue(latch.await(5 * idleTimeout, TimeUnit.MILLISECONDS));
} }
@Test @Test
@ -191,7 +189,7 @@ public class IdleTimeoutTest extends AbstractTest
} }
}); });
Assert.assertTrue(replyLatch.await(3 * idleTimeout, TimeUnit.MILLISECONDS)); Assert.assertTrue(replyLatch.await(5 * idleTimeout, TimeUnit.MILLISECONDS));
// Just make sure onClose() has never been called, but don't wait too much // Just make sure onClose() has never been called, but don't wait too much
Assert.assertFalse(closeLatch.await(idleTimeout / 2, TimeUnit.MILLISECONDS)); Assert.assertFalse(closeLatch.await(idleTimeout / 2, TimeUnit.MILLISECONDS));
@ -234,7 +232,7 @@ public class IdleTimeoutTest extends AbstractTest
} }
}, new Stream.Listener.Adapter()); }, new Stream.Listener.Adapter());
Assert.assertTrue(closeLatch.await(2 * idleTimeout, TimeUnit.MILLISECONDS)); Assert.assertTrue(closeLatch.await(5 * idleTimeout, TimeUnit.MILLISECONDS));
Assert.assertTrue(session.isClosed()); Assert.assertTrue(session.isClosed());
} }
@ -272,7 +270,7 @@ public class IdleTimeoutTest extends AbstractTest
} }
}, new Stream.Listener.Adapter()); }, new Stream.Listener.Adapter());
Assert.assertTrue(closeLatch.await(2 * idleTimeout, TimeUnit.MILLISECONDS)); Assert.assertTrue(closeLatch.await(5 * idleTimeout, TimeUnit.MILLISECONDS));
} }
@Test @Test
@ -325,7 +323,7 @@ public class IdleTimeoutTest extends AbstractTest
}); });
Assert.assertFalse(closeLatch.await(2 * idleTimeout, TimeUnit.MILLISECONDS)); Assert.assertFalse(closeLatch.await(2 * idleTimeout, TimeUnit.MILLISECONDS));
Assert.assertTrue(replyLatch.await(3 * idleTimeout, TimeUnit.MILLISECONDS)); Assert.assertTrue(replyLatch.await(5 * idleTimeout, TimeUnit.MILLISECONDS));
} }
@Test @Test
@ -480,8 +478,8 @@ public class IdleTimeoutTest extends AbstractTest
} }
}); });
Assert.assertTrue(dataLatch.await(2 * idleTimeout, TimeUnit.MILLISECONDS)); Assert.assertTrue(dataLatch.await(5 * idleTimeout, TimeUnit.MILLISECONDS));
Assert.assertFalse(timeoutLatch.await(0, TimeUnit.SECONDS)); Assert.assertFalse(timeoutLatch.await(1, TimeUnit.SECONDS));
} }
@Test @Test
@ -535,7 +533,7 @@ public class IdleTimeoutTest extends AbstractTest
stream.data(new DataFrame(stream.getId(), ByteBuffer.allocate(1), true), Callback.NOOP); stream.data(new DataFrame(stream.getId(), ByteBuffer.allocate(1), true), Callback.NOOP);
}); });
Assert.assertFalse(resetLatch.await(0, TimeUnit.SECONDS)); Assert.assertFalse(resetLatch.await(1, TimeUnit.SECONDS));
} }
@Test @Test

3
jetty-util/src/main/java/org/eclipse/jetty/util/StringUtil.java
View File

@ -117,6 +117,9 @@ public class StringUtil
*/ */
public static String asciiToLowerCase(String s) public static String asciiToLowerCase(String s)
{ {
if (s == null)
return null;
char[] c = null; char[] c = null;
int i=s.length(); int i=s.length();