Fixes #5083 - Convert synchronized usages to AutoLock.

Updates after review.

Signed-off-by: Simone Bordet <[email protected]>

jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationIntrospector.java

@@ -198,7 +198,7 @@ public void introspect(Object o, Object metaInfo)
 
         Class<?> clazz = o.getClass();
 
-        try (AutoLock ignored = _lock.lock())
+        try (AutoLock l = _lock.lock())
         {
             // Lock to ensure that only 1 thread can be introspecting, and that
             // thread must have fully finished generating the products of

jetty-client/src/main/java/org/eclipse/jetty/client/HttpChannel.java

@@ -60,7 +60,7 @@ public boolean associate(HttpExchange exchange)
     {
         boolean result = false;
         boolean abort = true;
-        try (AutoLock ignored = _lock.lock())
+        try (AutoLock l = _lock.lock())
         {
             if (_exchange == null)
             {
@@ -87,7 +87,7 @@ public boolean associate(HttpExchange exchange)
     public boolean disassociate(HttpExchange exchange)
     {
         boolean result = false;
-        try (AutoLock ignored = _lock.lock())
+        try (AutoLock l = _lock.lock())
         {
             HttpExchange existing = _exchange;
             _exchange = null;
@@ -105,7 +105,10 @@ public boolean disassociate(HttpExchange exchange)
 
     public HttpExchange getHttpExchange()
     {
-        return _lock.runLocked(() -> _exchange);
+        try (AutoLock l = _lock.lock())
+        {
+            return _exchange;
+        }
     }
 
     protected abstract HttpSender getHttpSender();

jetty-client/src/main/java/org/eclipse/jetty/client/HttpConnection.java

@@ -89,7 +89,7 @@ protected SendFailure send(HttpChannel channel, HttpExchange exchange)
         // the request is associated to the channel and sent.
         // Use a counter to support multiplexed requests.
         boolean send;
-        try (AutoLock ignored = lock.lock())
+        try (AutoLock l = lock.lock())
         {
             send = idleTimeoutGuard >= 0;
             if (send)
@@ -113,7 +113,7 @@ protected SendFailure send(HttpChannel channel, HttpExchange exchange)
                 result = new SendFailure(new HttpRequestException("Could not associate request to connection", request), false);
             }
 
-            try (AutoLock ignored = lock.lock())
+            try (AutoLock l = lock.lock())
             {
                 --idleTimeoutGuard;
                 idleTimeoutStamp = System.nanoTime();
@@ -252,7 +252,7 @@ private void applyRequestAuthentication(Request request)
 
     public boolean onIdleTimeout(long idleTimeout)
     {
-        try (AutoLock ignored = lock.lock())
+        try (AutoLock l = lock.lock())
         {
             if (idleTimeoutGuard == 0)
             {

jetty-client/src/main/java/org/eclipse/jetty/client/HttpExchange.java

@@ -70,7 +70,10 @@ public HttpRequest getRequest()
 
     public Throwable getRequestFailure()
     {
-        return lock.runLocked(() -> requestFailure);
+        try (AutoLock l = lock.lock())
+        {
+            return requestFailure;
+        }
     }
 
     public List<Response.ResponseListener> getResponseListeners()
@@ -85,7 +88,10 @@ public HttpResponse getResponse()
 
     public Throwable getResponseFailure()
     {
-        return lock.runLocked(() -> responseFailure);
+        try (AutoLock l = lock.lock())
+        {
+            return responseFailure;
+        }
     }
 
     /**
@@ -99,7 +105,7 @@ boolean associate(HttpChannel channel)
     {
         boolean result = false;
         boolean abort = false;
-        try (AutoLock ignored = lock.lock())
+        try (AutoLock l = lock.lock())
         {
             // Only associate if the exchange state is initial,
             // as the exchange could be already failed.
@@ -123,7 +129,7 @@ boolean associate(HttpChannel channel)
     void disassociate(HttpChannel channel)
     {
         boolean abort = false;
-        try (AutoLock ignored = lock.lock())
+        try (AutoLock l = lock.lock())
         {
             if (_channel != channel || requestState != State.TERMINATED || responseState != State.TERMINATED)
                 abort = true;
@@ -136,12 +142,18 @@ void disassociate(HttpChannel channel)
 
     private HttpChannel getHttpChannel()
     {
-        return lock.runLocked(() -> _channel);
+        try (AutoLock l = lock.lock())
+        {
+            return _channel;
+        }
     }
 
     public boolean requestComplete(Throwable failure)
     {
-        return lock.runLocked(() -> completeRequest(failure));
+        try (AutoLock l = lock.lock())
+        {
+            return completeRequest(failure);
+        }
     }
 
     private boolean completeRequest(Throwable failure)
@@ -157,7 +169,10 @@ private boolean completeRequest(Throwable failure)
 
     public boolean responseComplete(Throwable failure)
     {
-        return lock.runLocked(() -> completeResponse(failure));
+        try (AutoLock l = lock.lock())
+        {
+            return completeResponse(failure);
+        }
     }
 
     private boolean completeResponse(Throwable failure)
@@ -174,7 +189,7 @@ private boolean completeResponse(Throwable failure)
     public Result terminateRequest()
     {
         Result result = null;
-        try (AutoLock ignored = lock.lock())
+        try (AutoLock l = lock.lock())
         {
             if (requestState == State.COMPLETED)
                 requestState = State.TERMINATED;
@@ -191,7 +206,7 @@ public Result terminateRequest()
     public Result terminateResponse()
     {
         Result result = null;
-        try (AutoLock ignored = lock.lock())
+        try (AutoLock l = lock.lock())
         {
             if (responseState == State.COMPLETED)
                 responseState = State.TERMINATED;
@@ -211,7 +226,7 @@ public boolean abort(Throwable failure)
         // This will avoid that this exchange can be associated to a channel.
         boolean abortRequest;
         boolean abortResponse;
-        try (AutoLock ignored = lock.lock())
+        try (AutoLock l = lock.lock())
         {
             abortRequest = completeRequest(failure);
             abortResponse = completeResponse(failure);
@@ -270,7 +285,7 @@ private void notifyFailureComplete(Throwable failure)
 
     public void resetResponse()
     {
-        try (AutoLock ignored = lock.lock())
+        try (AutoLock l = lock.lock())
         {
             responseState = State.PENDING;
             responseFailure = null;
@@ -287,7 +302,7 @@ public void proceed(Throwable failure)
     @Override
     public String toString()
     {
-        try (AutoLock ignored = lock.lock())
+        try (AutoLock l = lock.lock())
         {
             return String.format("%s@%x req=%s/%s@%h res=%s/%s@%h",
                 HttpExchange.class.getSimpleName(),

jetty-client/src/main/java/org/eclipse/jetty/client/HttpReceiver.java

@@ -100,7 +100,7 @@ void demand(long n)
             throw new IllegalArgumentException("Invalid demand " + n);
 
         boolean resume = false;
-        try (AutoLock ignored = lock.lock())
+        try (AutoLock l = lock.lock())
         {
             demand = MathUtils.cappedAdd(demand, n);
             if (stalled)
@@ -128,12 +128,15 @@ protected long demand()
 
     private long demand(LongUnaryOperator operator)
     {
-        return lock.runLocked(() -> demand = operator.applyAsLong(demand));
+        try (AutoLock l = lock.lock())
+        {
+            return demand = operator.applyAsLong(demand);
+        }
     }
 
     protected boolean hasDemandOrStall()
     {
-        try (AutoLock ignored = lock.lock())
+        try (AutoLock l = lock.lock())
         {
             stalled = demand <= 0;
             return !stalled;

jetty-client/src/main/java/org/eclipse/jetty/client/MultiplexConnectionPool.java

@@ -82,13 +82,19 @@ private static int ceilDiv(int a, int b)
     @Override
     public int getMaxMultiplex()
     {
-        return lock.runLocked(() -> maxMultiplex);
+        try (AutoLock l = lock.lock())
+        {
+            return maxMultiplex;
+        }
     }
 
     @Override
     public void setMaxMultiplex(int maxMultiplex)
     {
-        lock.runLocked(() -> this.maxMultiplex = maxMultiplex);
+        try (AutoLock l = lock.lock())
+        {
+            this.maxMultiplex = maxMultiplex;
+        }
     }
 
     @Override
@@ -99,7 +105,7 @@ public boolean accept(Connection connection)
             LOG.debug("Accepted {} {}", accepted, connection);
         if (accepted)
         {
-            try (AutoLock ignored = lock.lock())
+            try (AutoLock l = lock.lock())
             {
                 Holder holder = new Holder(connection);
                 activeConnections.put(connection, holder);
@@ -113,22 +119,28 @@ public boolean accept(Connection connection)
     @Override
     public boolean isActive(Connection connection)
     {
-        return lock.runLocked(() -> activeConnections.containsKey(connection));
+        try (AutoLock l = lock.lock())
+        {
+            return activeConnections.containsKey(connection);
+        }
     }
 
     @Override
     protected void onCreated(Connection connection)
     {
-        // Use "cold" connections as last.
-        lock.runLocked(() -> idleConnections.offer(new Holder(connection)));
+        try (AutoLock l = lock.lock())
+        {
+            // Use "cold" connections as last.
+            idleConnections.offer(new Holder(connection));
+        }
         idle(connection, false);
     }
 
     @Override
     protected Connection activate()
     {
         Holder result = null;
-        try (AutoLock ignored = lock.lock())
+        try (AutoLock l = lock.lock())
         {
             for (Holder holder : activeConnections.values())
             {
@@ -159,7 +171,7 @@ public boolean release(Connection connection)
         boolean closed = isClosed();
         boolean idle = false;
         Holder holder;
-        try (AutoLock ignored = lock.lock())
+        try (AutoLock l = lock.lock())
         {
             holder = activeConnections.get(connection);
             if (holder != null)
@@ -195,7 +207,7 @@ protected boolean remove(Connection connection, boolean force)
     {
         boolean activeRemoved = true;
         boolean idleRemoved = false;
-        try (AutoLock ignored = lock.lock())
+        try (AutoLock l = lock.lock())
         {
             Holder holder = activeConnections.remove(connection);
             if (holder == null)
@@ -226,7 +238,7 @@ public void close()
     {
         super.close();
         List<Connection> connections;
-        try (AutoLock ignored = lock.lock())
+        try (AutoLock l = lock.lock())
         {
             connections = idleConnections.stream().map(holder -> holder.connection).collect(Collectors.toList());
             connections.addAll(activeConnections.keySet());
@@ -239,7 +251,7 @@ public void dump(Appendable out, String indent) throws IOException
     {
         DumpableCollection active;
         DumpableCollection idle;
-        try (AutoLock ignored = lock.lock())
+        try (AutoLock l = lock.lock())
         {
             active = new DumpableCollection("active", new ArrayList<>(activeConnections.values()));
             idle = new DumpableCollection("idle", new ArrayList<>(idleConnections));
@@ -251,7 +263,7 @@ public void dump(Appendable out, String indent) throws IOException
     public boolean sweep()
     {
         List<Connection> toSweep = new ArrayList<>();
-        try (AutoLock ignored = lock.lock())
+        try (AutoLock l = lock.lock())
         {
             activeConnections.values().stream()
                 .map(holder -> holder.connection)
@@ -279,7 +291,7 @@ public String toString()
     {
         int activeSize;
         int idleSize;
-        try (AutoLock ignored = lock.lock())
+        try (AutoLock l = lock.lock())
         {
             activeSize = activeConnections.size();
             idleSize = idleConnections.size();