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

jetty-9 - Avoiding StackOverflowErrors when processing changes.

This commit is contained in:
Simone Bordet 2012-09-17 09:53:09 +02:00
parent 4f1a2990de
commit 4ea5734ab1
1 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
jetty-io/src/main/java/org/eclipse/jetty/io/SelectorManager.java
View File

@ -53,6 +53,14 @@ import org.eclipse.jetty.util.log.Logger;
*/ */
public abstract class SelectorManager extends AbstractLifeCycle implements Dumpable public abstract class SelectorManager extends AbstractLifeCycle implements Dumpable
{ {
private static final ThreadLocal<Integer> _submissions = new ThreadLocal<Integer>()
{
@Override
protected Integer initialValue()
{
return 0;
}
};
protected static final Logger LOG = Log.getLogger(SelectorManager.class); protected static final Logger LOG = Log.getLogger(SelectorManager.class);
private final ManagedSelector[] _selectors; private final ManagedSelector[] _selectors;
@ -306,7 +314,8 @@ public abstract class SelectorManager extends AbstractLifeCycle implements Dumpa
*/ */
public boolean submit(Runnable change) public boolean submit(Runnable change)
{ {
if (Thread.currentThread() != _thread) int submissions = _submissions.get();
if (Thread.currentThread() != _thread || submissions >= 4)
{ {
_changes.offer(change); _changes.offer(change);
LOG.debug("Queued change {}", change); LOG.debug("Queued change {}", change);
@ -317,10 +326,18 @@ public abstract class SelectorManager extends AbstractLifeCycle implements Dumpa
} }
else else
{ {
LOG.debug("Submitted change {}", change); _submissions.set(submissions + 1);
runChanges(); try
runChange(change); {
return true; LOG.debug("Submitted change {}", change);
runChanges();
runChange(change);
return true;
}
finally
{
_submissions.set(submissions);
}
} }
} }