[qpid-broker-j] 02/02: QPID-8549: Follow-up changes

[orudyy]

This is an automated email from the ASF dual-hosted git repository.

orudyy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git

commit acbc5df03c92cfe6577840e5effb389d498a46c2
Author: Alex Rudyy <oru...@apache.org>
AuthorDate: Sun Jul 18 19:06:43 2021 +0100

    QPID-8549: Follow-up changes
---
 .../main/java/org/apache/qpid/server/queue/SortedQueueEntryList.java | 4 ++--
 .../org/apache/qpid/server/transport/MultiVersionProtocolEngine.java | 5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git 
a/broker-core/src/main/java/org/apache/qpid/server/queue/SortedQueueEntryList.java
 
b/broker-core/src/main/java/org/apache/qpid/server/queue/SortedQueueEntryList.java
index a41a265..cca4754 100644
--- 
a/broker-core/src/main/java/org/apache/qpid/server/queue/SortedQueueEntryList.java
+++ 
b/broker-core/src/main/java/org/apache/qpid/server/queue/SortedQueueEntryList.java
@@ -23,7 +23,7 @@ package org.apache.qpid.server.queue;
 import org.apache.qpid.server.message.ServerMessage;
 import org.apache.qpid.server.queue.SortedQueueEntry.Colour;
 import org.apache.qpid.server.store.MessageEnqueueRecord;
-import org.apache.qpid.server.util.ConnectionScopedRuntimeException;
+import org.apache.qpid.server.util.ServerScopedRuntimeException;
 
 /**
  * A sorted implementation of QueueEntryList.
@@ -109,7 +109,7 @@ public class SortedQueueEntryList extends 
AbstractQueueEntryList
             }
             if (parent == null)
             {
-                throw new ConnectionScopedRuntimeException("Failed to insert 
an entry, parent not found");
+                throw new ServerScopedRuntimeException("Failed to insert an 
entry, parent not found");
             }
             entry.setParent(parent);
 
diff --git 
a/broker-core/src/main/java/org/apache/qpid/server/transport/MultiVersionProtocolEngine.java
 
b/broker-core/src/main/java/org/apache/qpid/server/transport/MultiVersionProtocolEngine.java
index 85e79fb..d3ddbe2 100755
--- 
a/broker-core/src/main/java/org/apache/qpid/server/transport/MultiVersionProtocolEngine.java
+++ 
b/broker-core/src/main/java/org/apache/qpid/server/transport/MultiVersionProtocolEngine.java
@@ -28,7 +28,6 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.Iterator;
-import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;
@@ -65,7 +64,7 @@ public class MultiVersionProtocolEngine implements 
ProtocolEngine
     private final ProtocolEngineCreator[] _creators;
     private final Runnable _onCloseTask;
 
-    private Set<Protocol> _supported;
+    private final Set<Protocol> _supported;
     private String _fqdn;
     private final Broker<?> _broker;
     private ServerNetworkConnection _network;
@@ -474,7 +473,7 @@ public class MultiVersionProtocolEngine implements 
ProtocolEngine
                     {
                         ProtocolEngineCreator protocol = 
Arrays.stream(_creators)
                                 .filter(creator -> 
creator.getVersion().isAMQP() && _supported.contains(creator.getVersion()))
-                                .max((creator1, creator2) -> 
creator1.getVersion().ordinal() - creator2.getVersion().ordinal())
+                                .max(Comparator.comparingInt(creator -> 
creator.getVersion().ordinal()))
                                 .orElseThrow(() -> new 
ServerScopedRuntimeException("All AMQP protocols are disabled"));
                         supportedReplyBytes = protocol.getHeaderIdentifier();
                     }

---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org