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

Resolving merge

This commit is contained in:
Joakim Erdfelt 2011-10-28 13:42:07 -07:00
parent a32c1186e2 84b07f359e
commit e088acc559
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -63,7 +63,7 @@ public abstract class SelectorManager extends AbstractLifeCycle implements Dumpa
private long _lowResourcesConnections; private long _lowResourcesConnections;
private SelectSet[] _selectSet; private SelectSet[] _selectSet;
private int _selectSets=1; private int _selectSets=1;
private volatile int _set; private volatile int _set=0;
private boolean _deferringInterestedOps0=true; private boolean _deferringInterestedOps0=true;
private int _selectorPriorityDelta=0; private int _selectorPriorityDelta=0;
@ -128,6 +128,8 @@ public abstract class SelectorManager extends AbstractLifeCycle implements Dumpa
// be distributed over the available sets. // be distributed over the available sets.
int s=_set++; int s=_set++;
if (s<0)
s=-s;
s=s%_selectSets; s=s%_selectSets;
SelectSet[] sets=_selectSet; SelectSet[] sets=_selectSet;
if (sets!=null) if (sets!=null)
@ -150,6 +152,8 @@ public abstract class SelectorManager extends AbstractLifeCycle implements Dumpa
// be distributed over the available sets. // be distributed over the available sets.
int s=_set++; int s=_set++;
if (s<0)
s=-s;
s=s%_selectSets; s=s%_selectSets;
SelectSet[] sets=_selectSet; SelectSet[] sets=_selectSet;
if (sets!=null) if (sets!=null)
@ -167,6 +171,8 @@ public abstract class SelectorManager extends AbstractLifeCycle implements Dumpa
public void register(ServerSocketChannel acceptChannel) public void register(ServerSocketChannel acceptChannel)
{ {
int s=_set++; int s=_set++;
if (s<0)
s=-s;
s=s%_selectSets; s=s%_selectSets;
SelectSet set=_selectSet[s]; SelectSet set=_selectSet[s];
set.addChange(acceptChannel); set.addChange(acceptChannel);

2
jetty-util/src/test/java/org/eclipse/jetty/util/log/LogTest.java
View File

@ -44,7 +44,7 @@ public class LogTest
log.info("Test default logging"); log.info("Test default logging");
} }
@Test // @Test
public void testNamedLogNamed_StdErrLog() public void testNamedLogNamed_StdErrLog()
{ {
Log.setLog(new StdErrLog()); Log.setLog(new StdErrLog());