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

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
jetty · Feb 3, 2022 · 1c8887c · 1c8887c
2 parents d00e42a + 4037861
commit 1c8887c
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 9 deletions.
diff --git a/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationConfiguration.java b/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationConfiguration.java
@@ -97,7 +97,6 @@ public AnnotationConfiguration()
     {
         addDependencies(WebXmlConfiguration.class, MetaInfConfiguration.class, FragmentConfiguration.class, PlusConfiguration.class);
         addDependents(JettyWebXmlConfiguration.class);
-        protectAndExpose("org.eclipse.jetty.util.annotations.");
         hide("org.objectweb.asm.");
     }
 

diff --git a/jetty-gcloud/pom.xml b/jetty-gcloud/pom.xml
@@ -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>

diff --git a/jetty-io/src/main/java/org/eclipse/jetty/io/SelectorManager.java b/jetty-io/src/main/java/org/eclipse/jetty/io/SelectorManager.java
@@ -22,10 +22,10 @@
 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 @@ protected void connectionFailed(SelectableChannel channel, Throwable ex, Object
     @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 boolean addEventListener(EventListener listener)
     @Override
     public boolean removeEventListener(EventListener listener)
     {
-        if (isRunning())
-            throw new IllegalStateException(this.toString());
         if (super.removeEventListener(listener))
         {
             if (listener instanceof AcceptListener)

diff --git a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/JmxConfiguration.java b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/JmxConfiguration.java
@@ -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