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:14 UTC
[1/3] activemq-artemis git commit: Add missing @Override
Repository: activemq-artemis
Updated Branches:
refs/heads/master 67ce44fc0 -> 5f6aee118
Add missing @Override
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/775862ee
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/775862ee
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/775862ee
Branch: refs/heads/master
Commit: 775862ee72984a31b130427d4e0c9af3afe68859
Parents: 67ce44f
Author: Ville Skytt� <vi...@iki.fi>
Authored: Sun Sep 25 21:13:08 2016 +0300
Committer: Ville Skytt� <vi...@iki.fi>
Committed: Sun Sep 25 21:13:08 2016 +0300
----------------------------------------------------------------------
.../apache/activemq/artemis/core/server/impl/ServerSessionImpl.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/775862ee/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerSessionImpl.java
----------------------------------------------------------------------
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 3ccfd16..091c35c 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 class ServerSessionImpl implements ServerSession, FailureListener {
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
[2/3] activemq-artemis git commit: Java 1.7 build fix
Posted by cl...@apache.org.
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
// ---------------------------------------------------------------------------------
[3/3] activemq-artemis git commit: This closes #798
Posted by cl...@apache.org.
This closes #798
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/5f6aee11
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/5f6aee11
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/5f6aee11
Branch: refs/heads/master
Commit: 5f6aee11848b4a4a9b0d0d2b7439e7c7112ff343
Parents: 67ce44f 494c85d
Author: Clebert Suconic <cl...@apache.org>
Authored: Mon Sep 26 13:22:57 2016 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Mon Sep 26 13:22:57 2016 -0400
----------------------------------------------------------------------
.../activemq/artemis/core/server/impl/ActiveMQServerImpl.java | 3 ++-
.../activemq/artemis/core/server/impl/ServerSessionImpl.java | 1 +
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------