Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id AFA8B200CA3 for ; Thu, 1 Jun 2017 17:26:33 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id AE4A2160BDF; Thu, 1 Jun 2017 15:26:33 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 08CA0160BB5 for ; Thu, 1 Jun 2017 17:26:32 +0200 (CEST) Received: (qmail 68912 invoked by uid 500); 1 Jun 2017 15:26:32 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 68903 invoked by uid 99); 1 Jun 2017 15:26:32 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Jun 2017 15:26:32 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 20316DFF66; Thu, 1 Jun 2017 15:26:32 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: clebertsuconic@apache.org To: commits@activemq.apache.org Date: Thu, 01 Jun 2017 15:26:32 -0000 Message-Id: <070d249cbb2f4ba19ab7c940aa2c2afa@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] activemq-artemis git commit: ARTEMIS-1187 Incompatible version when recreating a session with older server archived-at: Thu, 01 Jun 2017 15:26:33 -0000 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 Authored: Thu Jun 1 16:35:43 2017 +0200 Committer: Tomas Hofman 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