comparison src/org/eclipse/jetty/server/AbstractHttpConnection.java @ 929:3191abe890ef

remove isInitial()
author Franklin Schmidt <fschmidt@gmail.com>
date Sun, 09 Oct 2016 19:13:46 -0600
parents 23a57aad34c0
children 6f7e2ff51879
comparison
equal deleted inserted replaced
928:23a57aad34c0 929:3191abe890ef
414 // already happened when unhandle is called. For a blocking connector, 414 // already happened when unhandle is called. For a blocking connector,
415 // the wait for the asynchronous dispatch or timeout actually happens 415 // the wait for the asynchronous dispatch or timeout actually happens
416 // within the call to unhandle(). 416 // within the call to unhandle().
417 417
418 final Server server=_server; 418 final Server server=_server;
419 boolean handling = _request._async.handling() && server!=null && server.isRunning(); 419 _request._async.handling();
420 if(handling) 420 if(server!=null && server.isRunning())
421 { 421 {
422 _request.setHandled(false); 422 _request.setHandled(false);
423 423
424 String info=null; 424 String info=null;
425 try 425 try
452 _request.setPathInfo(info); 452 _request.setPathInfo(info);
453 453
454 if (_out!=null) 454 if (_out!=null)
455 _out.reopen(); 455 _out.reopen();
456 456
457 if (_request._async.isInitial()) 457 _request.setDispatcherType(DispatcherType.REQUEST);
458 { 458 _connector.customize(_endp, _request);
459 _request.setDispatcherType(DispatcherType.REQUEST); 459 server.handle(this);
460 _connector.customize(_endp, _request);
461 server.handle(this);
462 }
463 else
464 {
465 _request.setDispatcherType(DispatcherType.ASYNC);
466 server.handleAsync(this);
467 }
468 } 460 }
469 catch (ContinuationThrowable e) 461 catch (ContinuationThrowable e)
470 { 462 {
471 LOG.trace("",e); 463 LOG.trace("",e);
472 } 464 }