You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by an...@apache.org on 2014/12/10 13:03:50 UTC
[1/2] activemq-6 git commit: ACTIVEMQ6-50 revert any new protocol
headers to keep backward compatibility
Repository: activemq-6
Updated Branches:
refs/heads/master d5359535e -> 09a6fee02
ACTIVEMQ6-50 revert any new protocol headers to keep backward compatibility
- revert the FORCED_DELIVERY_MESSAGE
back to "_hornetq"
- revert handshake header back to 'HORNETQ'
Project: http://git-wip-us.apache.org/repos/asf/activemq-6/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-6/commit/ff42c217
Tree: http://git-wip-us.apache.org/repos/asf/activemq-6/tree/ff42c217
Diff: http://git-wip-us.apache.org/repos/asf/activemq-6/diff/ff42c217
Branch: refs/heads/master
Commit: ff42c217f58657e640ecf4eee2377b117be50cf3
Parents: d535953
Author: gaohoward <hg...@redhat.com>
Authored: Wed Dec 10 11:15:53 2014 +0800
Committer: gaohoward <hg...@redhat.com>
Committed: Wed Dec 10 11:15:53 2014 +0800
----------------------------------------------------------------------
.../core/client/impl/ClientConsumerImpl.java | 5 +----
.../core/impl/ActiveMQClientProtocolManager.java | 2 +-
.../protocol/core/impl/CoreProtocolManager.java | 17 ++++++++---------
3 files changed, 10 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/ff42c217/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientConsumerImpl.java
----------------------------------------------------------------------
diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientConsumerImpl.java b/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientConsumerImpl.java
index 504d688..919882d 100644
--- a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientConsumerImpl.java
+++ b/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientConsumerImpl.java
@@ -63,10 +63,7 @@ public final class ClientConsumerImpl implements ClientConsumerInternal
private static final int NUM_PRIORITIES = 10;
-
- // TODO: We need to set this to _hornetq | activemq based on the version of the protocol
- // I have added a comment about this at https://issues.apache.org/jira/browse/ACTIVEMQ6-42
- public static final SimpleString FORCED_DELIVERY_MESSAGE = new SimpleString("_activemq.forced.delivery.seq");
+ public static final SimpleString FORCED_DELIVERY_MESSAGE = new SimpleString("_hornetq.forced.delivery.seq");
// Attributes
// -----------------------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/ff42c217/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/ActiveMQClientProtocolManager.java
----------------------------------------------------------------------
diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/ActiveMQClientProtocolManager.java b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/ActiveMQClientProtocolManager.java
index 6628a9e..b7366df 100644
--- a/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/ActiveMQClientProtocolManager.java
+++ b/activemq-core-client/src/main/java/org/apache/activemq/core/protocol/core/impl/ActiveMQClientProtocolManager.java
@@ -481,7 +481,7 @@ public class ActiveMQClientProtocolManager implements ClientProtocolManager
if (transportConnection.isUsingProtocolHandling())
{
// no need to send handshake on inVM as inVM is not using the NettyProtocolHandling
- String handshake = "ACTIVEMQ";
+ String handshake = "HORNETQ";
ActiveMQBuffer amqbuffer = connection.createBuffer(handshake.length());
amqbuffer.writeBytes(handshake.getBytes());
transportConnection.write(amqbuffer);
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/ff42c217/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/CoreProtocolManager.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/CoreProtocolManager.java b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/CoreProtocolManager.java
index 0558ae9..5e14697 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/CoreProtocolManager.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/protocol/core/impl/CoreProtocolManager.java
@@ -166,17 +166,16 @@ class CoreProtocolManager implements ProtocolManager
public void handshake(NettyServerConnection connection, ActiveMQBuffer buffer)
{
//if we are not an old client then handshake
- if (buffer.getByte(0) == 'A' &&
- buffer.getByte(1) == 'C' &&
- buffer.getByte(2) == 'T' &&
- buffer.getByte(3) == 'I' &&
- buffer.getByte(4) == 'V' &&
- buffer.getByte(5) == 'E' &&
- buffer.getByte(6) == 'M' &&
- buffer.getByte(7) == 'Q')
+ if (buffer.getByte(0) == 'H' &&
+ buffer.getByte(1) == 'O' &&
+ buffer.getByte(2) == 'R' &&
+ buffer.getByte(3) == 'N' &&
+ buffer.getByte(4) == 'E' &&
+ buffer.getByte(5) == 'T' &&
+ buffer.getByte(6) == 'Q')
{
//todo add some handshaking
- buffer.readBytes(8);
+ buffer.readBytes(7);
}
}
[2/2] activemq-6 git commit: merge #27 - revert any new protocol
headers to keep backward compatibility
Posted by an...@apache.org.
merge #27 - revert any new protocol headers to keep backward compatibility
Project: http://git-wip-us.apache.org/repos/asf/activemq-6/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-6/commit/09a6fee0
Tree: http://git-wip-us.apache.org/repos/asf/activemq-6/tree/09a6fee0
Diff: http://git-wip-us.apache.org/repos/asf/activemq-6/diff/09a6fee0
Branch: refs/heads/master
Commit: 09a6fee020fb79f1c4a2a08374e9dca90c93a6a8
Parents: d535953 ff42c21
Author: Andy Taylor <an...@gmail.com>
Authored: Wed Dec 10 12:01:50 2014 +0000
Committer: Andy Taylor <an...@gmail.com>
Committed: Wed Dec 10 12:01:50 2014 +0000
----------------------------------------------------------------------
.../core/client/impl/ClientConsumerImpl.java | 5 +----
.../core/impl/ActiveMQClientProtocolManager.java | 2 +-
.../protocol/core/impl/CoreProtocolManager.java | 17 ++++++++---------
3 files changed, 10 insertions(+), 14 deletions(-)
----------------------------------------------------------------------