Mercurial Hosting > luan

annotate src/org/eclipse/jetty/server/Server.java @ 884:cb78ee27b0e0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
remove Server.getVersion()
author Franklin Schmidt <fschmidt@gmail.com>
date Tue, 04 Oct 2016 16:30:02 -0600
parents 8c494fcd3d34
children 0d876a03ab0b
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
1 //
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
2 // ========================================================================
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
3 // Copyright (c) 1995-2014 Mort Bay Consulting Pty. Ltd.
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
4 // ------------------------------------------------------------------------
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
5 // All rights reserved. This program and the accompanying materials
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
6 // are made available under the terms of the Eclipse Public License v1.0
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
7 // and Apache License v2.0 which accompanies this distribution.
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
8 //
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
9 // The Eclipse Public License is available at
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
10 // http://www.eclipse.org/legal/epl-v10.html
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
11 //
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
12 // The Apache License v2.0 is available at
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
13 // http://www.opensource.org/licenses/apache2.0.php
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
14 //
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
15 // You may elect to redistribute this code under either of these licenses.
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
16 // ========================================================================
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
17 //
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
18
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
19 package org.eclipse.jetty.server;
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
20
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
21 import java.io.IOException;
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
22 import java.net.InetSocketAddress;
876
2efdb98f3543 use just one fixed Connector in Server
Franklin Schmidt <fschmidt@gmail.com>
parents: 875
diff changeset
23 import java.util.Collections;
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
24 import java.util.Enumeration;
865
6b210bb66c63 remove ThreadPool
Franklin Schmidt <fschmidt@gmail.com>
parents: 864
diff changeset
25 import java.util.concurrent.LinkedBlockingQueue;
6b210bb66c63 remove ThreadPool
Franklin Schmidt <fschmidt@gmail.com>
parents: 864
diff changeset
26 import java.util.concurrent.ThreadPoolExecutor;
6b210bb66c63 remove ThreadPool
Franklin Schmidt <fschmidt@gmail.com>
parents: 864
diff changeset
27 import java.util.concurrent.TimeUnit;
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
28
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
29 import javax.servlet.ServletException;
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
30 import javax.servlet.http.HttpServletRequest;
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
31 import javax.servlet.http.HttpServletResponse;
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
32
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
33 import org.eclipse.jetty.http.HttpURI;
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
34 import org.eclipse.jetty.server.handler.HandlerWrapper;
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
35 import org.eclipse.jetty.server.nio.SelectChannelConnector;
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
36 import org.eclipse.jetty.util.Attributes;
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
37 import org.eclipse.jetty.util.AttributesMap;
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
38 import org.eclipse.jetty.util.LazyList;
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
39 import org.eclipse.jetty.util.MultiException;
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
40 import org.eclipse.jetty.util.TypeUtil;
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
41 import org.eclipse.jetty.util.URIUtil;
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
42 import org.eclipse.jetty.util.component.Destroyable;
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
43 import org.eclipse.jetty.util.component.LifeCycle;
820
8e9db0bbf4f9 remove org.eclipse.jetty.util.log and upgrade slf4j
Franklin Schmidt <fschmidt@gmail.com>
parents: 812
diff changeset
44 import org.slf4j.Logger;
8e9db0bbf4f9 remove org.eclipse.jetty.util.log and upgrade slf4j
Franklin Schmidt <fschmidt@gmail.com>
parents: 812
diff changeset
45 import org.slf4j.LoggerFactory;
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
46
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
47 /* ------------------------------------------------------------ */
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
48 /** Jetty HTTP Servlet Server.
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
49 * This class is the main class for the Jetty HTTP Servlet server.
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
50 * It aggregates Connectors (HTTP request receivers) and request Handlers.
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
51 * The server is itself a handler and a ThreadPool. Connectors use the ThreadPool methods
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
52 * to run jobs that will eventually call the handle method.
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
53 *
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
54 * @org.apache.xbean.XBean description="Creates an embedded Jetty web server"
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
55 */
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
56 public class Server extends HandlerWrapper implements Attributes
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
57 {
820
8e9db0bbf4f9 remove org.eclipse.jetty.util.log and upgrade slf4j
Franklin Schmidt <fschmidt@gmail.com>
parents: 812
diff changeset
58 private static final Logger LOG = LoggerFactory.getLogger(Server.class);
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
59
884
cb78ee27b0e0 remove Server.getVersion()
Franklin Schmidt <fschmidt@gmail.com>
parents: 883
diff changeset
60 public static final String version = "8";
812
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
61
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
62 private final AttributesMap _attributes = new AttributesMap();
875
b9aa175d9a29 remove Server.getThreadPool()
Franklin Schmidt <fschmidt@gmail.com>
parents: 867
diff changeset
63 public final ThreadPoolExecutor threadPool;
876
2efdb98f3543 use just one fixed Connector in Server
Franklin Schmidt <fschmidt@gmail.com>
parents: 875
diff changeset
64 public final Connector connector;
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
65
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
66
812
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
67 /* ------------------------------------------------------------ */
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
68 /** Convenience constructor
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
69 * Creates server and a {@link SelectChannelConnector} at the passed port.
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
70 */
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
71 public Server(int port)
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
72 {
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
73 setServer(this);
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
74
876
2efdb98f3543 use just one fixed Connector in Server
Franklin Schmidt <fschmidt@gmail.com>
parents: 875
diff changeset
75 connector = new SelectChannelConnector();
812
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
76 connector.setPort(port);
876
2efdb98f3543 use just one fixed Connector in Server
Franklin Schmidt <fschmidt@gmail.com>
parents: 875
diff changeset
77 connector.setServer(this);
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
78
875
b9aa175d9a29 remove Server.getThreadPool()
Franklin Schmidt <fschmidt@gmail.com>
parents: 867
diff changeset
79 threadPool = new ThreadPoolExecutor(256, 256, 60, TimeUnit.SECONDS, new LinkedBlockingQueue<Runnable>());
812
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
80 }
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
81
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
82
812
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
83 /* ------------------------------------------------------------ */
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
84 @Override
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
85 protected void doStart() throws Exception
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
86 {
884
cb78ee27b0e0 remove Server.getVersion()
Franklin Schmidt <fschmidt@gmail.com>
parents: 883
diff changeset
87 LOG.info("jetty-"+version);
812
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
88
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
89 MultiException mex=new MultiException();
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
90
812
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
91 try
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
92 {
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
93 super.doStart();
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
94 }
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
95 catch(Throwable e)
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
96 {
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
97 mex.add(e);
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
98 }
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
99
876
2efdb98f3543 use just one fixed Connector in Server
Franklin Schmidt <fschmidt@gmail.com>
parents: 875
diff changeset
100 if (mex.size()==0)
812
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
101 {
876
2efdb98f3543 use just one fixed Connector in Server
Franklin Schmidt <fschmidt@gmail.com>
parents: 875
diff changeset
102 try{connector.start();}
2efdb98f3543 use just one fixed Connector in Server
Franklin Schmidt <fschmidt@gmail.com>
parents: 875
diff changeset
103 catch(Throwable e)
812
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
104 {
876
2efdb98f3543 use just one fixed Connector in Server
Franklin Schmidt <fschmidt@gmail.com>
parents: 875
diff changeset
105 mex.add(e);
812
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
106 }
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
107 }
883
8c494fcd3d34 remove Server._dump*
Franklin Schmidt <fschmidt@gmail.com>
parents: 882
diff changeset
108 /*
812
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
109 if (isDumpAfterStart())
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
110 dumpStdErr();
883
8c494fcd3d34 remove Server._dump*
Franklin Schmidt <fschmidt@gmail.com>
parents: 882
diff changeset
111 */
812
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
112 mex.ifExceptionThrow();
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
113 }
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
114
812
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
115 /* ------------------------------------------------------------ */
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
116 @Override
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
117 protected void doStop() throws Exception
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
118 {
883
8c494fcd3d34 remove Server._dump*
Franklin Schmidt <fschmidt@gmail.com>
parents: 882
diff changeset
119 /*
812
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
120 if (isDumpBeforeStop())
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
121 dumpStdErr();
883
8c494fcd3d34 remove Server._dump*
Franklin Schmidt <fschmidt@gmail.com>
parents: 882
diff changeset
122 */
812
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
123 MultiException mex=new MultiException();
880
00b3bd6e0ada remove Server._graceful
Franklin Schmidt <fschmidt@gmail.com>
parents: 879
diff changeset
124 /*
812
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
125 if (_graceful>0)
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
126 {
876
2efdb98f3543 use just one fixed Connector in Server
Franklin Schmidt <fschmidt@gmail.com>
parents: 875
diff changeset
127 LOG.info("Graceful shutdown {}",connector);
2efdb98f3543 use just one fixed Connector in Server
Franklin Schmidt <fschmidt@gmail.com>
parents: 875
diff changeset
128 try{connector.close();}catch(Throwable e){mex.add(e);}
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
129
812
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
130 Handler[] contexts = getChildHandlersByClass(Graceful.class);
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
131 for (int c=0;c<contexts.length;c++)
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
132 {
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
133 Graceful context=(Graceful)contexts[c];
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
134 LOG.info("Graceful shutdown {}",context);
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
135 context.setShutdown(true);
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
136 }
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
137 Thread.sleep(_graceful);
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
138 }
880
00b3bd6e0ada remove Server._graceful
Franklin Schmidt <fschmidt@gmail.com>
parents: 879
diff changeset
139 */
876
2efdb98f3543 use just one fixed Connector in Server
Franklin Schmidt <fschmidt@gmail.com>
parents: 875
diff changeset
140 try{connector.stop();}catch(Throwable e){mex.add(e);}
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
141
875
b9aa175d9a29 remove Server.getThreadPool()
Franklin Schmidt <fschmidt@gmail.com>
parents: 867
diff changeset
142 threadPool.shutdownNow();
867
Franklin Schmidt <fschmidt@gmail.com>
parents: 865
diff changeset
143
812
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
144 try {super.doStop(); } catch(Throwable e) { mex.add(e);}
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
145
812
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
146 mex.ifExceptionThrow();
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
147 }
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
148
812
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
149 /* ------------------------------------------------------------ */
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
150 /* Handle a request from a connection.
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
151 * Called to handle a request on the connection when either the header has been received,
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
152 * or after the entire request has been received (for short requests of known length), or
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
153 * on the dispatch of an async request.
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
154 */
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
155 public void handle(AbstractHttpConnection connection) throws IOException, ServletException
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
156 {
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
157 final String target=connection.getRequest().getPathInfo();
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
158 final Request request=connection.getRequest();
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
159 final Response response=connection.getResponse();
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
160
812
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
161 if (LOG.isDebugEnabled())
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
162 {
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
163 LOG.debug("REQUEST "+target+" on "+connection);
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
164 handle(target, request, request, response);
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
165 LOG.debug("RESPONSE "+target+" "+connection.getResponse().getStatus()+" handled="+request.isHandled());
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
166 }
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
167 else
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
168 handle(target, request, request, response);
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
169 }
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
170
812
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
171 /* ------------------------------------------------------------ */
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
172 /* Handle a request from a connection.
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
173 * Called to handle a request on the connection when either the header has been received,
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
174 * or after the entire request has been received (for short requests of known length), or
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
175 * on the dispatch of an async request.
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
176 */
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
177 public void handleAsync(AbstractHttpConnection connection) throws IOException, ServletException
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
178 {
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
179 final AsyncContinuation async = connection.getRequest().getAsyncContinuation();
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
180 final AsyncContinuation.AsyncEventState state = async.getAsyncEventState();
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
181
812
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
182 final Request baseRequest=connection.getRequest();
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
183 final String path=state.getPath();
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
184
812
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
185 if (path!=null)
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
186 {
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
187 // this is a dispatch with a path
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
188 final String contextPath=state.getServletContext().getContextPath();
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
189 HttpURI uri = new HttpURI(URIUtil.addPaths(contextPath,path));
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
190 baseRequest.setUri(uri);
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
191 baseRequest.setRequestURI(null);
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
192 baseRequest.setPathInfo(baseRequest.getRequestURI());
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
193 if (uri.getQuery()!=null)
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
194 baseRequest.mergeQueryString(uri.getQuery()); //we have to assume dispatch path and query are UTF8
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
195 }
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
196
812
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
197 final String target=baseRequest.getPathInfo();
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
198 final HttpServletRequest request=(HttpServletRequest)async.getRequest();
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
199 final HttpServletResponse response=(HttpServletResponse)async.getResponse();
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
200
812
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
201 if (LOG.isDebugEnabled())
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
202 {
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
203 LOG.debug("REQUEST "+target+" on "+connection);
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
204 handle(target, baseRequest, request, response);
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
205 LOG.debug("RESPONSE "+target+" "+connection.getResponse().getStatus());
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
206 }
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
207 else
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
208 handle(target, baseRequest, request, response);
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
209
812
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
210 }
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
211
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
212
812
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
213 /* ------------------------------------------------------------ */
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
214 public void join() throws InterruptedException
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
215 {
875
b9aa175d9a29 remove Server.getThreadPool()
Franklin Schmidt <fschmidt@gmail.com>
parents: 867
diff changeset
216 threadPool.awaitTermination(Long.MAX_VALUE, TimeUnit.MILLISECONDS);
812
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
217 }
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
218
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
219 /* ------------------------------------------------------------ */
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
220 /*
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
221 * @see org.eclipse.util.AttributesMap#clearAttributes()
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
222 */
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
223 public void clearAttributes()
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
224 {
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
225 _attributes.clearAttributes();
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
226 }
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
227
812
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
228 /* ------------------------------------------------------------ */
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
229 /*
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
230 * @see org.eclipse.util.AttributesMap#getAttribute(java.lang.String)
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
231 */
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
232 public Object getAttribute(String name)
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
233 {
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
234 return _attributes.getAttribute(name);
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
235 }
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
236
812
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
237 /* ------------------------------------------------------------ */
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
238 /*
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
239 * @see org.eclipse.util.AttributesMap#getAttributeNames()
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
240 */
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
241 public Enumeration getAttributeNames()
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
242 {
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
243 return AttributesMap.getAttributeNamesCopy(_attributes);
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
244 }
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
245
812
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
246 /* ------------------------------------------------------------ */
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
247 /*
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
248 * @see org.eclipse.util.AttributesMap#removeAttribute(java.lang.String)
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
249 */
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
250 public void removeAttribute(String name)
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
251 {
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
252 _attributes.removeAttribute(name);
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
253 }
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
254
812
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
255 /* ------------------------------------------------------------ */
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
256 /*
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
257 * @see org.eclipse.util.AttributesMap#setAttribute(java.lang.String, java.lang.Object)
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
258 */
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
259 public void setAttribute(String name, Object attribute)
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
260 {
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
261 _attributes.setAttribute(name, attribute);
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
262 }
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
263
812
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
264 /* ------------------------------------------------------------ */
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
265 @Override
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
266 public String toString()
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
267 {
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
268 return this.getClass().getName()+"@"+Integer.toHexString(hashCode());
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
269 }
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
270
812
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
271 /* ------------------------------------------------------------ */
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
272 @Override
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
273 public void dump(Appendable out,String indent) throws IOException
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
274 {
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
275 dumpThis(out);
876
2efdb98f3543 use just one fixed Connector in Server
Franklin Schmidt <fschmidt@gmail.com>
parents: 875
diff changeset
276 dump(out,indent,TypeUtil.asList(getHandlers()),getBeans(),Collections.singletonList(connector));
812
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
277 }
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
278
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
279
812
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
280 /* ------------------------------------------------------------ */
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
281 /* A handler that can be gracefully shutdown.
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
282 * Called by doStop if a {@link #setGracefulShutdown} period is set.
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
283 * TODO move this somewhere better
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
284 */
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
285 public interface Graceful extends Handler
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
286 {
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
287 public void setShutdown(boolean shutdown);
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
288 }
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
289
865
6b210bb66c63 remove ThreadPool
Franklin Schmidt <fschmidt@gmail.com>
parents: 864
diff changeset
290
6b210bb66c63 remove ThreadPool
Franklin Schmidt <fschmidt@gmail.com>
parents: 864
diff changeset
291 public final boolean isLowOnThreads()
6b210bb66c63 remove ThreadPool
Franklin Schmidt <fschmidt@gmail.com>
parents: 864
diff changeset
292 {
6b210bb66c63 remove ThreadPool
Franklin Schmidt <fschmidt@gmail.com>
parents: 864
diff changeset
293 // getActiveCount() locks the thread pool, so execute it last
875
b9aa175d9a29 remove Server.getThreadPool()
Franklin Schmidt <fschmidt@gmail.com>
parents: 867
diff changeset
294 return threadPool.getPoolSize() == threadPool.getMaximumPoolSize() &&
b9aa175d9a29 remove Server.getThreadPool()
Franklin Schmidt <fschmidt@gmail.com>
parents: 867
diff changeset
295 threadPool.getQueue().size() >= threadPool.getPoolSize() - threadPool.getActiveCount();
865
6b210bb66c63 remove ThreadPool
Franklin Schmidt <fschmidt@gmail.com>
parents: 864
diff changeset
296 }
6b210bb66c63 remove ThreadPool
Franklin Schmidt <fschmidt@gmail.com>
parents: 864
diff changeset
297
6b210bb66c63 remove ThreadPool
Franklin Schmidt <fschmidt@gmail.com>
parents: 864
diff changeset
298
812
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
299 /* ------------------------------------------------------------ */
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
300 public static void main(String...args) throws Exception
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
301 {
884
cb78ee27b0e0 remove Server.getVersion()
Franklin Schmidt <fschmidt@gmail.com>
parents: 883
diff changeset
302 System.err.println(version);
812
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
303 }
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
304 }