Mercurial Hosting > luan
comparison src/org/eclipse/jetty/server/Request.java @ 820:8e9db0bbf4f9
remove org.eclipse.jetty.util.log and upgrade slf4j
author | Franklin Schmidt <fschmidt@gmail.com> |
---|---|
date | Tue, 13 Sep 2016 23:13:06 -0600 |
parents | 07c82fabc46b |
children | 0048a843297a |
comparison
equal
deleted
inserted
replaced
819:17bd0b170ed6 | 820:8e9db0bbf4f9 |
---|---|
88 import org.eclipse.jetty.util.MultiMap; | 88 import org.eclipse.jetty.util.MultiMap; |
89 import org.eclipse.jetty.util.MultiPartInputStream; | 89 import org.eclipse.jetty.util.MultiPartInputStream; |
90 import org.eclipse.jetty.util.StringUtil; | 90 import org.eclipse.jetty.util.StringUtil; |
91 import org.eclipse.jetty.util.URIUtil; | 91 import org.eclipse.jetty.util.URIUtil; |
92 import org.eclipse.jetty.util.UrlEncoded; | 92 import org.eclipse.jetty.util.UrlEncoded; |
93 import org.eclipse.jetty.util.log.Log; | 93 import org.slf4j.Logger; |
94 import org.eclipse.jetty.util.log.Logger; | 94 import org.slf4j.LoggerFactory; |
95 | 95 |
96 /* ------------------------------------------------------------ */ | 96 /* ------------------------------------------------------------ */ |
97 /** | 97 /** |
98 * Jetty Request. | 98 * Jetty Request. |
99 * <p> | 99 * <p> |
125 public class Request implements HttpServletRequest | 125 public class Request implements HttpServletRequest |
126 { | 126 { |
127 public static final String __MULTIPART_CONFIG_ELEMENT = "org.eclipse.multipartConfig"; | 127 public static final String __MULTIPART_CONFIG_ELEMENT = "org.eclipse.multipartConfig"; |
128 public static final String __MULTIPART_INPUT_STREAM = "org.eclipse.multiPartInputStream"; | 128 public static final String __MULTIPART_INPUT_STREAM = "org.eclipse.multiPartInputStream"; |
129 public static final String __MULTIPART_CONTEXT = "org.eclipse.multiPartContext"; | 129 public static final String __MULTIPART_CONTEXT = "org.eclipse.multiPartContext"; |
130 private static final Logger LOG = Log.getLogger(Request.class); | 130 private static final Logger LOG = LoggerFactory.getLogger(Request.class); |
131 | 131 |
132 private static final String __ASYNC_FWD = "org.eclipse.asyncfwd"; | 132 private static final String __ASYNC_FWD = "org.eclipse.asyncfwd"; |
133 private static final Collection __defaultLocale = Collections.singleton(Locale.getDefault()); | 133 private static final Collection __defaultLocale = Collections.singleton(Locale.getDefault()); |
134 private static final int __NONE = 0, _STREAM = 1, __READER = 2; | 134 private static final int __NONE = 0, _STREAM = 1, __READER = 2; |
135 | 135 |
272 _uri.decodeQueryTo(_baseParameters,_queryEncoding); | 272 _uri.decodeQueryTo(_baseParameters,_queryEncoding); |
273 } | 273 } |
274 catch (UnsupportedEncodingException e) | 274 catch (UnsupportedEncodingException e) |
275 { | 275 { |
276 if (LOG.isDebugEnabled()) | 276 if (LOG.isDebugEnabled()) |
277 LOG.warn(e); | 277 LOG.warn("",e); |
278 else | 278 else |
279 LOG.warn(e.toString()); | 279 LOG.warn(e.toString()); |
280 } | 280 } |
281 } | 281 } |
282 } | 282 } |
347 UrlEncoded.decodeTo(in,_baseParameters,encoding,content_length < 0?maxFormContentSize:-1,maxFormKeys); | 347 UrlEncoded.decodeTo(in,_baseParameters,encoding,content_length < 0?maxFormContentSize:-1,maxFormKeys); |
348 } | 348 } |
349 catch (IOException e) | 349 catch (IOException e) |
350 { | 350 { |
351 if (LOG.isDebugEnabled()) | 351 if (LOG.isDebugEnabled()) |
352 LOG.warn(e); | 352 LOG.warn("",e); |
353 else | 353 else |
354 LOG.warn(e.toString()); | 354 LOG.warn(e.toString()); |
355 } | 355 } |
356 } | 356 } |
357 } | 357 } |
381 getParts(); | 381 getParts(); |
382 } | 382 } |
383 catch (IOException e) | 383 catch (IOException e) |
384 { | 384 { |
385 if (LOG.isDebugEnabled()) | 385 if (LOG.isDebugEnabled()) |
386 LOG.warn(e); | 386 LOG.warn("",e); |
387 else | 387 else |
388 LOG.warn(e.toString()); | 388 LOG.warn(e.toString()); |
389 } | 389 } |
390 catch (ServletException e) | 390 catch (ServletException e) |
391 { | 391 { |
392 if (LOG.isDebugEnabled()) | 392 if (LOG.isDebugEnabled()) |
393 LOG.warn(e); | 393 LOG.warn("",e); |
394 else | 394 else |
395 LOG.warn(e.toString()); | 395 LOG.warn(e.toString()); |
396 } | 396 } |
397 } | 397 } |
398 } | 398 } |
1144 { | 1144 { |
1145 _serverName = InetAddress.getLocalHost().getHostAddress(); | 1145 _serverName = InetAddress.getLocalHost().getHostAddress(); |
1146 } | 1146 } |
1147 catch (java.net.UnknownHostException e) | 1147 catch (java.net.UnknownHostException e) |
1148 { | 1148 { |
1149 LOG.ignore(e); | 1149 LOG.trace("",e); |
1150 } | 1150 } |
1151 return _serverName; | 1151 return _serverName; |
1152 } | 1152 } |
1153 | 1153 |
1154 /* ------------------------------------------------------------ */ | 1154 /* ------------------------------------------------------------ */ |
1363 while (r != -1) | 1363 while (r != -1) |
1364 r = _reader.read(); | 1364 r = _reader.read(); |
1365 } | 1365 } |
1366 catch (Exception e) | 1366 catch (Exception e) |
1367 { | 1367 { |
1368 LOG.ignore(e); | 1368 LOG.trace("",e); |
1369 _reader = null; | 1369 _reader = null; |
1370 } | 1370 } |
1371 } | 1371 } |
1372 | 1372 |
1373 _async.recycle(); | 1373 _async.recycle(); |