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 2015/07/21 23:19:01 UTC
[1/2] activemq-artemis git commit: This closes #88 Fix jdk 1.7 build
on MQTT
Repository: activemq-artemis
Updated Branches:
refs/heads/master 9b356bd5c -> 5a57bf6f2
This closes #88 Fix jdk 1.7 build on MQTT
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/5a57bf6f
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/5a57bf6f
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/5a57bf6f
Branch: refs/heads/master
Commit: 5a57bf6f29bf072f270a38ec0bb3438bdcf5e7af
Parents: 9b356bd 0dcad8f
Author: Clebert Suconic <cl...@apache.org>
Authored: Tue Jul 21 22:18:49 2015 +0100
Committer: Clebert Suconic <cl...@apache.org>
Committed: Tue Jul 21 22:18:49 2015 +0100
----------------------------------------------------------------------
.../activemq/artemis/core/protocol/mqtt/MQTTSessionState.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
[2/2] activemq-artemis git commit: Fix MQTT build
Posted by cl...@apache.org.
Fix MQTT build
putIfAbsent() is a ConcurrentHashMap method.
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/0dcad8fc
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/0dcad8fc
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/0dcad8fc
Branch: refs/heads/master
Commit: 0dcad8fc597510f444fe2df380e7e82de5f35197
Parents: 9b356bd
Author: Ville Skyttä <vi...@iki.fi>
Authored: Mon Jul 20 21:29:41 2015 +0300
Committer: Clebert Suconic <cl...@apache.org>
Committed: Tue Jul 21 22:18:49 2015 +0100
----------------------------------------------------------------------
.../activemq/artemis/core/protocol/mqtt/MQTTSessionState.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/0dcad8fc/artemis-protocols/artemis-mqtt-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/mqtt/MQTTSessionState.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-mqtt-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/mqtt/MQTTSessionState.java b/artemis-protocols/artemis-mqtt-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/mqtt/MQTTSessionState.java
index b7fa436..468d43a 100644
--- a/artemis-protocols/artemis-mqtt-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/mqtt/MQTTSessionState.java
+++ b/artemis-protocols/artemis-mqtt-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/mqtt/MQTTSessionState.java
@@ -39,7 +39,7 @@ public class MQTTSessionState
// Used to store Packet ID of Publish QoS1 and QoS2 message. See spec: 4.3.3 QoS 2: Exactly once delivery. Method B.
private Map<Integer, MQTTMessageInfo> messageRefStore;
- private Map<String, Map<Long, Integer>> addressMessageMap;
+ private ConcurrentHashMap<String, Map<Long, Integer>> addressMessageMap;
private Set<Integer> pubRec;