Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed merge

This commit is contained in:
Greg Wilkins 2014-08-29 17:54:28 +10:00
parent dacc796831
commit 277ca5c065
2 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
jetty-server/src/main/java/org/eclipse/jetty/server/handler/IdleTimeoutHandler.java
View File

@ -90,35 +90,35 @@ public class IdleTimeoutHandler extends HandlerWrapper
}
finally
{
if (_applyToAsync && request.isAsyncStarted())
if (_applyToAsync && request.isAsyncStarted())
{
request.getAsyncContext().addListener(new AsyncListener()
{
request.getAsyncContext().addListener(new AsyncListener()
@Override
public void onTimeout(AsyncEvent event) throws IOException
{
}
@Override
public void onStartAsync(AsyncEvent event) throws IOException
{
@Override
public void onTimeout(AsyncEvent event) throws IOException
{
}
@Override
public void onStartAsync(AsyncEvent event) throws IOException
{
}
@Override
public void onError(AsyncEvent event) throws IOException
{
channel.setIdleTimeout(idle_timeout);
}
@Override
public void onComplete(AsyncEvent event) throws IOException
{
channel.setIdleTimeout(idle_timeout);
}
});
}
else
channel.setIdleTimeout(idle_timeout);
}
@Override
public void onError(AsyncEvent event) throws IOException
{
channel.setIdleTimeout(idle_timeout);
}
@Override
public void onComplete(AsyncEvent event) throws IOException
{
channel.setIdleTimeout(idle_timeout);
}
});
}
else
channel.setIdleTimeout(idle_timeout);
}
}
}

2
tests/test-quickstart/pom.xml
View File

@ -12,7 +12,7 @@
<description>Jetty Quick Start Test</description>
<url>http://www.eclipse.org/jetty</url>
<properties>
<bundle-symbolic-name>${project.groupId}.examples.quickstart</bundle-symbolic-name>
<bundle-symbolic-name>${project.groupId}.tests.quickstart</bundle-symbolic-name>
</properties>
<dependencies>
<dependency>