activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clebertsuco...@apache.org
Subject [1/2] activemq-artemis git commit: ARTEMIS-1187 Incompatible version when recreating a session with older server
Date Thu, 01 Jun 2017 15:26:32 GMT
Repository: activemq-artemis
Updated Branches:
  refs/heads/1.x 567b0741c -> e57ae8980


ARTEMIS-1187 Incompatible version when recreating a session with older server

https://issues.jboss.org/browse/JBEAP-9522

(cherry picked from commit c3871a183f48b6cccaa3a65e7c14b2b64e16b39d)


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

Branch: refs/heads/1.x
Commit: dcf0210605c2b30128c493550e1316b9ec765b41
Parents: 567b074
Author: Tomas Hofman <thofman@redhat.com>
Authored: Thu Jun 1 16:35:43 2017 +0200
Committer: Tomas Hofman <thofman@redhat.com>
Committed: Thu Jun 1 16:35:43 2017 +0200

----------------------------------------------------------------------
 .../artemis/core/protocol/core/impl/ActiveMQSessionContext.java   | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/dcf02106/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ActiveMQSessionContext.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ActiveMQSessionContext.java
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ActiveMQSessionContext.java
index d355253..b74f988 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ActiveMQSessionContext.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ActiveMQSessionContext.java
@@ -104,7 +104,6 @@ import org.apache.activemq.artemis.spi.core.remoting.Connection;
 import org.apache.activemq.artemis.spi.core.remoting.ReadyListener;
 import org.apache.activemq.artemis.spi.core.remoting.SessionContext;
 import org.apache.activemq.artemis.utils.TokenBucketLimiterImpl;
-import org.apache.activemq.artemis.utils.VersionLoader;
 import org.jboss.logging.Logger;
 
 import static org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.DISCONNECT_CONSUMER;
@@ -643,7 +642,7 @@ public class ActiveMQSessionContext extends SessionContext {
                                                    boolean autoCommitSends,
                                                    boolean autoCommitAcks,
                                                    boolean preAcknowledge) {
-      return new CreateSessionMessage(name, sessionChannel.getID(), VersionLoader.getVersion().getIncrementingVersion(),
username, password, minLargeMessageSize, xa, autoCommitSends, autoCommitAcks, preAcknowledge,
confirmationWindow, null);
+      return new CreateSessionMessage(name, sessionChannel.getID(), serverVersion, username,
password, minLargeMessageSize, xa, autoCommitSends, autoCommitAcks, preAcknowledge, confirmationWindow,
null);
    }
 
    @Override


Mime
View raw message