diff options
| author | Jesse McConnell | 2012-08-17 19:50:43 +0000 |
|---|---|---|
| committer | Jesse McConnell | 2012-08-17 19:50:43 +0000 |
| commit | 5de0cee1ebab84b6467018f6435410f402e2e881 (patch) | |
| tree | ce197c6db67fea49ff4574cb490f15f657c7d2f9 /jetty-server/src/test/java/org/eclipse/jetty/server/SelectChannelTimeoutTest.java | |
| parent | c82871b10f1110b6e30e3aaa485b6955ce6e639c (diff) | |
| parent | 00ed5498988062d768ee306da708d338a96253dc (diff) | |
| download | org.eclipse.jetty.project-5de0cee1ebab84b6467018f6435410f402e2e881.tar.gz org.eclipse.jetty.project-5de0cee1ebab84b6467018f6435410f402e2e881.tar.xz org.eclipse.jetty.project-5de0cee1ebab84b6467018f6435410f402e2e881.zip | |
merge from master + license block standardization
Diffstat (limited to 'jetty-server/src/test/java/org/eclipse/jetty/server/SelectChannelTimeoutTest.java')
| -rw-r--r-- | jetty-server/src/test/java/org/eclipse/jetty/server/SelectChannelTimeoutTest.java | 29 |
1 files changed, 17 insertions, 12 deletions
diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/SelectChannelTimeoutTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/SelectChannelTimeoutTest.java index c7c6cbaf5d..a59ef3288b 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/SelectChannelTimeoutTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/SelectChannelTimeoutTest.java @@ -1,15 +1,20 @@ -// ======================================================================== -// Copyright (c) 2010 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. -// ======================================================================== +// +// ======================================================================== +// Copyright (c) 1995-2012 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; |