activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From andytay...@apache.org
Subject [2/3] activemq-artemis git commit: ACTIVEMQ-106 Drop ConnectionControl Packet
Date Wed, 20 May 2015 10:01:32 GMT
ACTIVEMQ-106 Drop ConnectionControl Packet


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

Branch: refs/heads/master
Commit: 2de3bfa9f1e7ebdc01c4726d8345da2b2839589f
Parents: 042a8f5
Author: Martyn Taylor <mtaylor@redhat.com>
Authored: Fri May 15 11:57:10 2015 +0100
Committer: Martyn Taylor <mtaylor@redhat.com>
Committed: Wed May 20 10:40:50 2015 +0100

----------------------------------------------------------------------
 .../artemis/core/protocol/openwire/AMQConnectorImpl.java      | 2 +-
 .../core/protocol/openwire/OpenWireProtocolManager.java       | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/2de3bfa9/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/AMQConnectorImpl.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/AMQConnectorImpl.java
b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/AMQConnectorImpl.java
index e6ccd0e..ca83418 100644
--- a/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/AMQConnectorImpl.java
+++ b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/AMQConnectorImpl.java
@@ -84,7 +84,7 @@ public class AMQConnectorImpl implements AMQConnector
    public boolean isAllowLinkStealing()
    {
       // TODO Auto-generated method stub
-      return false;
+      return true;
    }
 
    @Override

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/2de3bfa9/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireProtocolManager.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireProtocolManager.java
b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireProtocolManager.java
index 5991ddc..b2e1027 100644
--- a/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireProtocolManager.java
+++ b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireProtocolManager.java
@@ -232,6 +232,13 @@ public class OpenWireProtocolManager implements ProtocolManager<Interceptor>
       {
          case CommandTypes.CONNECTION_INFO:
             break;
+         case CommandTypes.CONNECTION_CONTROL:
+            /** The ConnectionControl packet sent from client informs the broker that is
capable of supporting dynamic
+             * failover and load balancing.  These features are not yet implemented for Artemis
OpenWire.  Instead we
+             * simply drop the packet.  See: ACTIVEMQ6-108 */
+            break;
+         case CommandTypes.CONSUMER_CONTROL:
+            break;
          default:
             throw new IllegalStateException("Cannot handle command: " + command);
       }


Mime
View raw message