You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2016/09/26 17:23:15 UTC
[2/3] activemq-artemis git commit: Java 1.7 build fix
Java 1.7 build fix
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/494c85d6
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/494c85d6
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/494c85d6
Branch: refs/heads/master
Commit: 494c85d624b306f27ca7e5de690f4ec6074a9d8d
Parents: 775862e
Author: Ville Skytt� <vi...@iki.fi>
Authored: Sun Sep 25 21:13:29 2016 +0300
Committer: Ville Skytt� <vi...@iki.fi>
Committed: Sun Sep 25 21:13:55 2016 +0300
----------------------------------------------------------------------
.../activemq/artemis/core/server/impl/ActiveMQServerImpl.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/494c85d6/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
----------------------------------------------------------------------
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 b72d8f6..5323d98 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;
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 @@ public class ActiveMQServerImpl implements ActiveMQServer {
private final List<ActiveMQComponent> externalComponents = new ArrayList<>();
- private final Map<String, AtomicInteger> connectedClientIds = new ConcurrentHashMap();
+ private final ConcurrentMap<String, AtomicInteger> connectedClientIds = new ConcurrentHashMap();
// Constructors
// ---------------------------------------------------------------------------------