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/02/12 21:40:57 UTC

[1/2] activemq-6 git commit: Set client (!server) version on recreate session

Repository: activemq-6
Updated Branches:
  refs/heads/master cf6e19ead -> e2983e538


Set client (!server) version on recreate session


Project: http://git-wip-us.apache.org/repos/asf/activemq-6/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-6/commit/92103831
Tree: http://git-wip-us.apache.org/repos/asf/activemq-6/tree/92103831
Diff: http://git-wip-us.apache.org/repos/asf/activemq-6/diff/92103831

Branch: refs/heads/master
Commit: 92103831260ab0445bfb2c582a684a82ca892940
Parents: 33addb4
Author: Martyn Taylor <mt...@redhat.com>
Authored: Thu Feb 12 12:46:17 2015 +0000
Committer: Martyn Taylor <mt...@redhat.com>
Committed: Thu Feb 12 12:46:17 2015 +0000

----------------------------------------------------------------------
 .../activemq/core/protocol/core/impl/ActiveMQSessionContext.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-6/blob/92103831/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/ActiveMQSessionContext.java
----------------------------------------------------------------------
diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/ActiveMQSessionContext.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/ActiveMQSessionContext.java
index 17632c4..c1ec157 100644
--- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/ActiveMQSessionContext.java
+++ b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/ActiveMQSessionContext.java
@@ -99,6 +99,7 @@ import org.apache.activemq.spi.core.protocol.RemotingConnection;
 import org.apache.activemq.spi.core.remoting.Connection;
 import org.apache.activemq.spi.core.remoting.SessionContext;
 import org.apache.activemq.utils.TokenBucketLimiterImpl;
+import org.apache.activemq.utils.VersionLoader;
 
 import static org.apache.activemq.core.protocol.core.impl.PacketImpl.DISCONNECT_CONSUMER;
 import static org.apache.activemq.core.protocol.core.impl.PacketImpl.EXCEPTION;
@@ -628,7 +629,7 @@ public class ActiveMQSessionContext extends SessionContext
    {
       Packet createRequest = new CreateSessionMessage(name,
                                                       sessionChannel.getID(),
-                                                      getServerVersion(),
+                                                      VersionLoader.getVersion().getIncrementingVersion(),
                                                       username,
                                                       password,
                                                       minLargeMessageSize,


[2/2] activemq-6 git commit: This closes #96 on a Setting client version

Posted by cl...@apache.org.
This closes #96 on a Setting client version


Project: http://git-wip-us.apache.org/repos/asf/activemq-6/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-6/commit/e2983e53
Tree: http://git-wip-us.apache.org/repos/asf/activemq-6/tree/e2983e53
Diff: http://git-wip-us.apache.org/repos/asf/activemq-6/diff/e2983e53

Branch: refs/heads/master
Commit: e2983e5384ab889bb3a6f2f80922b3de09ee8316
Parents: cf6e19e 9210383
Author: Clebert Suconic <cl...@apache.org>
Authored: Thu Feb 12 15:28:15 2015 -0500
Committer: Clebert Suconic <cl...@apache.org>
Committed: Thu Feb 12 15:28:15 2015 -0500

----------------------------------------------------------------------
 .../activemq/core/protocol/core/impl/ActiveMQSessionContext.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------