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

Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'. 

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
This commit is contained in:
Simone Bordet 2022-02-03 09:55:51 +01:00
parent d00e42a8b9 4037861668
commit 1c8887c715
No known key found for this signature in database
GPG Key ID: 1677D141BCF3584D
4 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationConfiguration.java
View File

@ -97,7 +97,6 @@ public class AnnotationConfiguration extends AbstractConfiguration
{
addDependencies(WebXmlConfiguration.class, MetaInfConfiguration.class, FragmentConfiguration.class, PlusConfiguration.class);
addDependents(JettyWebXmlConfiguration.class);
protectAndExpose("org.eclipse.jetty.util.annotations.");
hide("org.objectweb.asm.");
}

2
jetty-gcloud/pom.xml
View File

@ -13,7 +13,7 @@
<name>Jetty :: GCloud</name>
<properties>
<gcloud.version>2.2.2</gcloud.version>
<gcloud.version>2.2.3</gcloud.version>
</properties>
<modules>

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

@ -22,10 +22,10 @@ import java.nio.channels.SelectionKey;
import java.nio.channels.Selector;
import java.nio.channels.ServerSocketChannel;
import java.nio.channels.SocketChannel;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.EventListener;
import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.Executor;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.function.IntUnaryOperator;
@ -60,7 +60,7 @@ public abstract class SelectorManager extends ContainerLifeCycle implements Dump
private final ManagedSelector[] _selectors;
private final AtomicInteger _selectorIndex = new AtomicInteger();
private final IntUnaryOperator _selectorIndexUpdate;
private final List<AcceptListener> _acceptListeners = new ArrayList<>();
private final List<AcceptListener> _acceptListeners = new CopyOnWriteArrayList<>();
private long _connectTimeout = DEFAULT_CONNECT_TIMEOUT;
private ThreadPoolBudget.Lease _lease;
@ -396,8 +396,6 @@ public abstract class SelectorManager extends ContainerLifeCycle implements Dump
@Override
public boolean addEventListener(EventListener listener)
{
if (isRunning())
throw new IllegalStateException(this.toString());
if (super.addEventListener(listener))
{
if (listener instanceof AcceptListener)
@ -410,8 +408,6 @@ public abstract class SelectorManager extends ContainerLifeCycle implements Dump
@Override
public boolean removeEventListener(EventListener listener)
{
if (isRunning())
throw new IllegalStateException(this.toString());
if (super.removeEventListener(listener))
{
if (listener instanceof AcceptListener)

2
jetty-webapp/src/main/java/org/eclipse/jetty/webapp/JmxConfiguration.java
View File

@ -32,7 +32,7 @@ public class JmxConfiguration extends AbstractConfiguration
public JmxConfiguration()
{
addDependents(WebXmlConfiguration.class, MetaInfConfiguration.class, WebInfConfiguration.class);
protectAndExpose("org.eclipse.jetty.jmx.");
protectAndExpose("org.eclipse.jetty.util.annotation", "org.eclipse.jetty.jmx.");
}
@Override