From 775862ee72984a31b130427d4e0c9af3afe68859 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sun, 25 Sep 2016 21:13:08 +0300 Subject: [PATCH 1/2] Add missing @Override --- .../activemq/artemis/core/server/impl/ServerSessionImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerSessionImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerSessionImpl.java index 3ccfd16f950..091c35cb178 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerSessionImpl.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerSessionImpl.java @@ -1259,6 +1259,7 @@ public RoutingStatus send(final ServerMessage message, final boolean direct, boo return send(getCurrentTransaction(), message, direct, noAutoCreateQueue); } + @Override public RoutingStatus send(Transaction tx, final ServerMessage message, final boolean direct, boolean noAutoCreateQueue) throws Exception { // If the protocol doesn't support flow control, we have no choice other than fail the communication From 494c85d624b306f27ca7e5de690f4ec6074a9d8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sun, 25 Sep 2016 21:13:29 +0300 Subject: [PATCH 2/2] Java 1.7 build fix --- .../activemq/artemis/core/server/impl/ActiveMQServerImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java index b72d8f60350..5323d986ae3 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java @@ -36,6 +36,7 @@ import java.util.Map.Entry; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; @@ -312,7 +313,7 @@ enum SERVER_STATE { private final List externalComponents = new ArrayList<>(); - private final Map connectedClientIds = new ConcurrentHashMap(); + private final ConcurrentMap connectedClientIds = new ConcurrentHashMap(); // Constructors // ---------------------------------------------------------------------------------