Mercurial Hosting > luan

annotate src/org/eclipse/jetty/server/Server.java @ 890:5dc615c34848

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
remove _integralPort
author Franklin Schmidt <fschmidt@gmail.com>
date Thu, 06 Oct 2016 23:29:22 -0600
parents df84a1741687
children 1d0c304e12b5
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;
886
0d876a03ab0b add back Server.addConnector() - needed for ssl
Franklin Schmidt <fschmidt@gmail.com>
parents: 884
diff changeset
25 import java.util.List;
0d876a03ab0b add back Server.addConnector() - needed for ssl
Franklin Schmidt <fschmidt@gmail.com>
parents: 884
diff changeset
26 import java.util.ArrayList;
865
6b210bb66c63 remove ThreadPool
Franklin Schmidt <fschmidt@gmail.com>
parents: 864
diff changeset
27 import java.util.concurrent.LinkedBlockingQueue;
6b210bb66c63 remove ThreadPool
Franklin Schmidt <fschmidt@gmail.com>
parents: 864
diff changeset
28 import java.util.concurrent.ThreadPoolExecutor;
6b210bb66c63 remove ThreadPool
Franklin Schmidt <fschmidt@gmail.com>
parents: 864
diff changeset
29 import java.util.concurrent.TimeUnit;
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
30
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
31 import javax.servlet.ServletException;
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
32 import javax.servlet.http.HttpServletRequest;
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
33 import javax.servlet.http.HttpServletResponse;
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
34
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
35 import org.eclipse.jetty.http.HttpURI;
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
36 import org.eclipse.jetty.server.handler.HandlerWrapper;
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
37 import org.eclipse.jetty.server.nio.SelectChannelConnector;
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
38 import org.eclipse.jetty.util.Attributes;
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
39 import org.eclipse.jetty.util.AttributesMap;
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
40 import org.eclipse.jetty.util.LazyList;
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
41 import org.eclipse.jetty.util.MultiException;
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
42 import org.eclipse.jetty.util.TypeUtil;
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
43 import org.eclipse.jetty.util.URIUtil;
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
44 import org.eclipse.jetty.util.component.Destroyable;
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
45 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
46 import org.slf4j.Logger;
8e9db0bbf4f9 remove org.eclipse.jetty.util.log and upgrade slf4j
Franklin Schmidt <fschmidt@gmail.com>
parents: 812
diff changeset
47 import org.slf4j.LoggerFactory;
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
48
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
49 /* ------------------------------------------------------------ */
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
50 /** Jetty HTTP Servlet Server.
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
51 * 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
52 * It aggregates Connectors (HTTP request receivers) and request Handlers.
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
53 * 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
54 * to run jobs that will eventually call the handle method.
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 * @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
57 */
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
58 public class Server extends HandlerWrapper implements Attributes
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
59 {
820
8e9db0bbf4f9 remove org.eclipse.jetty.util.log and upgrade slf4j
Franklin Schmidt <fschmidt@gmail.com>
parents: 812
diff changeset
60 private static final Logger LOG = LoggerFactory.getLogger(Server.class);
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
61
884
cb78ee27b0e0 remove Server.getVersion()
Franklin Schmidt <fschmidt@gmail.com>
parents: 883
diff changeset
62 public static final String version = "8";
812
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
63
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
64 private final AttributesMap _attributes = new AttributesMap();
887
df84a1741687 make Connector reference to server explicit
Franklin Schmidt <fschmidt@gmail.com>
parents: 886
diff changeset
65 public final ThreadPoolExecutor threadPool = new ThreadPoolExecutor(256, 256, 60, TimeUnit.SECONDS, new LinkedBlockingQueue<Runnable>());
df84a1741687 make Connector reference to server explicit
Franklin Schmidt <fschmidt@gmail.com>
parents: 886
diff changeset
66 final List<Connector> connectors = new ArrayList<Connector>();
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
67
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
68
887
df84a1741687 make Connector reference to server explicit
Franklin Schmidt <fschmidt@gmail.com>
parents: 886
diff changeset
69 public Server() {
df84a1741687 make Connector reference to server explicit
Franklin Schmidt <fschmidt@gmail.com>
parents: 886
diff changeset
70 setServer(this);
df84a1741687 make Connector reference to server explicit
Franklin Schmidt <fschmidt@gmail.com>
parents: 886
diff changeset
71 }
df84a1741687 make Connector reference to server explicit
Franklin Schmidt <fschmidt@gmail.com>
parents: 886
diff changeset
72
812
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
73 public Server(int port)
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
74 {
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
75 setServer(this);
887
df84a1741687 make Connector reference to server explicit
Franklin Schmidt <fschmidt@gmail.com>
parents: 886
diff changeset
76 new SelectChannelConnector(this,port);
886
0d876a03ab0b add back Server.addConnector() - needed for ssl
Franklin Schmidt <fschmidt@gmail.com>
parents: 884
diff changeset
77 }
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
78
812
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
79 /* ------------------------------------------------------------ */
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
80 @Override
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
81 protected void doStart() throws Exception
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
82 {
884
cb78ee27b0e0 remove Server.getVersion()
Franklin Schmidt <fschmidt@gmail.com>
parents: 883
diff changeset
83 LOG.info("jetty-"+version);
812
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
84
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
85 MultiException mex=new MultiException();
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
86
812
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
87 try
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 super.doStart();
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
90 }
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
91 catch(Throwable e)
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 mex.add(e);
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
94 }
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
95
886
0d876a03ab0b add back Server.addConnector() - needed for ssl
Franklin Schmidt <fschmidt@gmail.com>
parents: 884
diff changeset
96 if (mex.size()==0) {
0d876a03ab0b add back Server.addConnector() - needed for ssl
Franklin Schmidt <fschmidt@gmail.com>
parents: 884
diff changeset
97 for( Connector connector : connectors ) {
0d876a03ab0b add back Server.addConnector() - needed for ssl
Franklin Schmidt <fschmidt@gmail.com>
parents: 884
diff changeset
98 try{connector.start();}
0d876a03ab0b add back Server.addConnector() - needed for ssl
Franklin Schmidt <fschmidt@gmail.com>
parents: 884
diff changeset
99 catch(Throwable e)
0d876a03ab0b add back Server.addConnector() - needed for ssl
Franklin Schmidt <fschmidt@gmail.com>
parents: 884
diff changeset
100 {
0d876a03ab0b add back Server.addConnector() - needed for ssl
Franklin Schmidt <fschmidt@gmail.com>
parents: 884
diff changeset
101 mex.add(e);
0d876a03ab0b add back Server.addConnector() - needed for ssl
Franklin Schmidt <fschmidt@gmail.com>
parents: 884
diff changeset
102 }
812
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
103 }
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
104 }
883
8c494fcd3d34 remove Server._dump*
Franklin Schmidt <fschmidt@gmail.com>
parents: 882
diff changeset
105 /*
812
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
106 if (isDumpAfterStart())
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
107 dumpStdErr();
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 mex.ifExceptionThrow();
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
110 }
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
111
812
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
112 /* ------------------------------------------------------------ */
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
113 @Override
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
114 protected void doStop() throws Exception
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
115 {
883
8c494fcd3d34 remove Server._dump*
Franklin Schmidt <fschmidt@gmail.com>
parents: 882
diff changeset
116 /*
812
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
117 if (isDumpBeforeStop())
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
118 dumpStdErr();
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 MultiException mex=new MultiException();
880
00b3bd6e0ada remove Server._graceful
Franklin Schmidt <fschmidt@gmail.com>
parents: 879
diff changeset
121 /*
812
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
122 if (_graceful>0)
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
123 {
876
2efdb98f3543 use just one fixed Connector in Server
Franklin Schmidt <fschmidt@gmail.com>
parents: 875
diff changeset
124 LOG.info("Graceful shutdown {}",connector);
2efdb98f3543 use just one fixed Connector in Server
Franklin Schmidt <fschmidt@gmail.com>
parents: 875
diff changeset
125 try{connector.close();}catch(Throwable e){mex.add(e);}
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
126
812
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
127 Handler[] contexts = getChildHandlersByClass(Graceful.class);
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
128 for (int c=0;c<contexts.length;c++)
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
129 {
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
130 Graceful context=(Graceful)contexts[c];
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
131 LOG.info("Graceful shutdown {}",context);
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
132 context.setShutdown(true);
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
133 }
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
134 Thread.sleep(_graceful);
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
135 }
880
00b3bd6e0ada remove Server._graceful
Franklin Schmidt <fschmidt@gmail.com>
parents: 879
diff changeset
136 */
886
0d876a03ab0b add back Server.addConnector() - needed for ssl
Franklin Schmidt <fschmidt@gmail.com>
parents: 884
diff changeset
137 for( Connector connector : connectors ) {
0d876a03ab0b add back Server.addConnector() - needed for ssl
Franklin Schmidt <fschmidt@gmail.com>
parents: 884
diff changeset
138 try{connector.stop();}catch(Throwable e){mex.add(e);}
0d876a03ab0b add back Server.addConnector() - needed for ssl
Franklin Schmidt <fschmidt@gmail.com>
parents: 884
diff changeset
139 }
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
140
875
b9aa175d9a29 remove Server.getThreadPool()
Franklin Schmidt <fschmidt@gmail.com>
parents: 867
diff changeset
141 threadPool.shutdownNow();
867
Franklin Schmidt <fschmidt@gmail.com>
parents: 865
diff changeset
142
812
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
143 try {super.doStop(); } catch(Throwable e) { mex.add(e);}
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
144
812
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
145 mex.ifExceptionThrow();
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
146 }
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
147
812
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
148 /* ------------------------------------------------------------ */
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
149 /* Handle a request from a connection.
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
150 * 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
151 * 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
152 * on the dispatch of an async request.
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
153 */
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
154 public void handle(AbstractHttpConnection connection) throws IOException, ServletException
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
155 {
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
156 final String target=connection.getRequest().getPathInfo();
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
157 final Request request=connection.getRequest();
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
158 final Response response=connection.getResponse();
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
159
812
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
160 if (LOG.isDebugEnabled())
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
161 {
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
162 LOG.debug("REQUEST "+target+" on "+connection);
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
163 handle(target, request, request, response);
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
164 LOG.debug("RESPONSE "+target+" "+connection.getResponse().getStatus()+" handled="+request.isHandled());
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
165 }
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
166 else
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
167 handle(target, request, request, response);
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
168 }
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
169
812
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
170 /* ------------------------------------------------------------ */
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
171 /* Handle a request from a connection.
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
172 * 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
173 * 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
174 * on the dispatch of an async request.
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
175 */
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
176 public void handleAsync(AbstractHttpConnection connection) throws IOException, ServletException
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
177 {
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
178 final AsyncContinuation async = connection.getRequest().getAsyncContinuation();
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
179 final AsyncContinuation.AsyncEventState state = async.getAsyncEventState();
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
180
812
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
181 final Request baseRequest=connection.getRequest();
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
182 final String path=state.getPath();
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
183
812
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
184 if (path!=null)
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
185 {
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
186 // this is a dispatch with a path
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
187 final String contextPath=state.getServletContext().getContextPath();
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
188 HttpURI uri = new HttpURI(URIUtil.addPaths(contextPath,path));
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
189 baseRequest.setUri(uri);
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
190 baseRequest.setRequestURI(null);
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
191 baseRequest.setPathInfo(baseRequest.getRequestURI());
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
192 if (uri.getQuery()!=null)
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
193 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
194 }
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
195
812
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
196 final String target=baseRequest.getPathInfo();
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
197 final HttpServletRequest request=(HttpServletRequest)async.getRequest();
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
198 final HttpServletResponse response=(HttpServletResponse)async.getResponse();
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
199
812
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
200 if (LOG.isDebugEnabled())
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
201 {
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
202 LOG.debug("REQUEST "+target+" on "+connection);
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
203 handle(target, baseRequest, request, response);
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
204 LOG.debug("RESPONSE "+target+" "+connection.getResponse().getStatus());
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
205 }
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
206 else
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
207 handle(target, baseRequest, request, response);
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
208
812
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
209 }
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
210
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
211
812
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
212 /* ------------------------------------------------------------ */
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
213 public void join() throws InterruptedException
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
214 {
875
b9aa175d9a29 remove Server.getThreadPool()
Franklin Schmidt <fschmidt@gmail.com>
parents: 867
diff changeset
215 threadPool.awaitTermination(Long.MAX_VALUE, TimeUnit.MILLISECONDS);
812
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
216 }
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 * @see org.eclipse.util.AttributesMap#clearAttributes()
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
221 */
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
222 public void clearAttributes()
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
223 {
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
224 _attributes.clearAttributes();
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
225 }
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
226
812
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
227 /* ------------------------------------------------------------ */
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 * @see org.eclipse.util.AttributesMap#getAttribute(java.lang.String)
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
230 */
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
231 public Object getAttribute(String name)
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
232 {
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
233 return _attributes.getAttribute(name);
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
234 }
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
235
812
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
236 /* ------------------------------------------------------------ */
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 * @see org.eclipse.util.AttributesMap#getAttributeNames()
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
239 */
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
240 public Enumeration getAttributeNames()
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
241 {
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
242 return AttributesMap.getAttributeNamesCopy(_attributes);
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
243 }
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
244
812
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
245 /* ------------------------------------------------------------ */
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 * @see org.eclipse.util.AttributesMap#removeAttribute(java.lang.String)
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
248 */
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
249 public void removeAttribute(String name)
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
250 {
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
251 _attributes.removeAttribute(name);
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
252 }
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
253
812
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
254 /* ------------------------------------------------------------ */
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 * @see org.eclipse.util.AttributesMap#setAttribute(java.lang.String, java.lang.Object)
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
257 */
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
258 public void setAttribute(String name, Object attribute)
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
259 {
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
260 _attributes.setAttribute(name, attribute);
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
261 }
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
262
812
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
263 /* ------------------------------------------------------------ */
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
264 @Override
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
265 public String toString()
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
266 {
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
267 return this.getClass().getName()+"@"+Integer.toHexString(hashCode());
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
268 }
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
269
812
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
270 /* ------------------------------------------------------------ */
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
271 @Override
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
272 public void dump(Appendable out,String indent) throws IOException
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
273 {
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
274 dumpThis(out);
886
0d876a03ab0b add back Server.addConnector() - needed for ssl
Franklin Schmidt <fschmidt@gmail.com>
parents: 884
diff changeset
275 dump(out,indent,TypeUtil.asList(getHandlers()),getBeans(),connectors);
812
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
276 }
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
277
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
278
812
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
279 /* ------------------------------------------------------------ */
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
280 /* A handler that can be gracefully shutdown.
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
281 * Called by doStop if a {@link #setGracefulShutdown} period is set.
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
282 * TODO move this somewhere better
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
283 */
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
284 public interface Graceful extends Handler
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
285 {
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
286 public void setShutdown(boolean shutdown);
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
287 }
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
288
865
6b210bb66c63 remove ThreadPool
Franklin Schmidt <fschmidt@gmail.com>
parents: 864
diff changeset
289
6b210bb66c63 remove ThreadPool
Franklin Schmidt <fschmidt@gmail.com>
parents: 864
diff changeset
290 public final boolean isLowOnThreads()
6b210bb66c63 remove ThreadPool
Franklin Schmidt <fschmidt@gmail.com>
parents: 864
diff changeset
291 {
6b210bb66c63 remove ThreadPool
Franklin Schmidt <fschmidt@gmail.com>
parents: 864
diff changeset
292 // getActiveCount() locks the thread pool, so execute it last
875
b9aa175d9a29 remove Server.getThreadPool()
Franklin Schmidt <fschmidt@gmail.com>
parents: 867
diff changeset
293 return threadPool.getPoolSize() == threadPool.getMaximumPoolSize() &&
b9aa175d9a29 remove Server.getThreadPool()
Franklin Schmidt <fschmidt@gmail.com>
parents: 867
diff changeset
294 threadPool.getQueue().size() >= threadPool.getPoolSize() - threadPool.getActiveCount();
865
6b210bb66c63 remove ThreadPool
Franklin Schmidt <fschmidt@gmail.com>
parents: 864
diff changeset
295 }
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
812
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
298 /* ------------------------------------------------------------ */
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
299 public static void main(String...args) throws Exception
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
300 {
884
cb78ee27b0e0 remove Server.getVersion()
Franklin Schmidt <fschmidt@gmail.com>
parents: 883
diff changeset
301 System.err.println(version);
812
700317ba03ad remove SessionIdManager
Franklin Schmidt <fschmidt@gmail.com>
parents: 802
diff changeset
302 }
802
3428c60d7cfc replace jetty jars with source
Franklin Schmidt <fschmidt@gmail.com>
parents:
diff changeset
303 }