diff options
| author | Thomas Becker | 2012-08-21 09:19:02 +0000 |
|---|---|---|
| committer | Thomas Becker | 2012-08-21 09:19:02 +0000 |
| commit | 2bd6cf2ebfdf9f315e12934732f54550d889812b (patch) | |
| tree | e6e28e9deb0293636c4dd3aed008332194cf5f51 /jetty-util/src/main/java/org/eclipse/jetty/util/thread/Timeout.java | |
| parent | 1721a56c6d9586c8b90df78bf16db930011d6e97 (diff) | |
| parent | 74e6be5097e53d9bdbb917a9372a44b8c3c3d48b (diff) | |
| download | org.eclipse.jetty.project-2bd6cf2ebfdf9f315e12934732f54550d889812b.tar.gz org.eclipse.jetty.project-2bd6cf2ebfdf9f315e12934732f54550d889812b.tar.xz org.eclipse.jetty.project-2bd6cf2ebfdf9f315e12934732f54550d889812b.zip | |
Merge branch 'master' of ssh://git.eclipse.org:29418/jetty/org.eclipse.jetty.project
Diffstat (limited to 'jetty-util/src/main/java/org/eclipse/jetty/util/thread/Timeout.java')
| -rw-r--r-- | jetty-util/src/main/java/org/eclipse/jetty/util/thread/Timeout.java | 29 |
1 files changed, 17 insertions, 12 deletions
diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/thread/Timeout.java b/jetty-util/src/main/java/org/eclipse/jetty/util/thread/Timeout.java index a2e9853403..321e451006 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/thread/Timeout.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/thread/Timeout.java @@ -1,15 +1,20 @@ -// ======================================================================== -// Copyright (c) 2004-2009 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.util.thread; |