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

Fix for bug #288514: AbstractConnector does not handle InterruptedExceptions on shutdown. 

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@810 7e9141cc-0065-0410-87d8-b60c137991c4
This commit is contained in:
Simone Bordet 2009-09-03 16:37:47 +00:00
parent 37d55422e6
commit c5b769634d
2 changed files with 127 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
VERSION.txt
View File

@ -5,6 +5,7 @@ jetty-7.0.0.RC6-SNAPSHOT
+ JETTY-1086 Use UncheckedPrintWriter + JETTY-1086 Use UncheckedPrintWriter
+ JETTY-1090 resolve potential infinite loop with webdav listener + JETTY-1090 resolve potential infinite loop with webdav listener
+ JETTY-1093 Request.toString throws exception when size exceeds 4k + JETTY-1093 Request.toString throws exception when size exceeds 4k
+ 288514 AbstractConnector does not handle InterruptedExceptions on shutdown
jetty-7.0.0.RC5 27 August 2009 jetty-7.0.0.RC5 27 August 2009
+ 286911 Clean out cache when recycling HTTP fields + 286911 Clean out cache when recycling HTTP fields

6
jetty-server/src/main/java/org/eclipse/jetty/server/AbstractConnector.java
View File

@ -17,7 +17,6 @@ import java.io.IOException;
import java.net.InetAddress; import java.net.InetAddress;
import java.net.Socket; import java.net.Socket;
import java.net.UnknownHostException; import java.net.UnknownHostException;
import javax.servlet.ServletRequest; import javax.servlet.ServletRequest;
import org.eclipse.jetty.http.HttpBuffers; import org.eclipse.jetty.http.HttpBuffers;
@ -753,6 +752,11 @@ public abstract class AbstractConnector extends HttpBuffers implements Connector
{ {
Log.ignore(e); Log.ignore(e);
} }
catch (InterruptedException x)
{
// Connector has been stopped
Log.ignore(x);
}
catch(ThreadDeath e) catch(ThreadDeath e)
{ {
throw e; throw e;