You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by de...@apache.org on 2017/03/06 14:14:29 UTC

activemq git commit: https://issues.apache.org/jira/browse/AMQ-6470 - Remove unused ControlCommand handling in client

Repository: activemq
Updated Branches:
  refs/heads/activemq-5.14.x 2dfe0c7c2 -> b8fc78ec6


https://issues.apache.org/jira/browse/AMQ-6470 - Remove unused ControlCommand handling in client

(cherry picked from commit 338a74dfa42a7b19d39adecacfa5f626a050e807)


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

Branch: refs/heads/activemq-5.14.x
Commit: b8fc78ec6c367cbe2a40a674eaec64ac3d7d1ecb
Parents: 2dfe0c7
Author: Dejan Bosanac <de...@nighttale.net>
Authored: Tue Oct 18 12:04:11 2016 +0200
Committer: Dejan Bosanac <de...@nighttale.net>
Committed: Mon Mar 6 14:54:55 2017 +0100

----------------------------------------------------------------------
 .../org/apache/activemq/ActiveMQConnection.java | 20 --------------------
 1 file changed, 20 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq/blob/b8fc78ec/activemq-client/src/main/java/org/apache/activemq/ActiveMQConnection.java
----------------------------------------------------------------------
diff --git a/activemq-client/src/main/java/org/apache/activemq/ActiveMQConnection.java b/activemq-client/src/main/java/org/apache/activemq/ActiveMQConnection.java
index 1f360cb..8e6c157 100755
--- a/activemq-client/src/main/java/org/apache/activemq/ActiveMQConnection.java
+++ b/activemq-client/src/main/java/org/apache/activemq/ActiveMQConnection.java
@@ -1873,7 +1873,6 @@ public class ActiveMQConnection implements Connection, TopicConnection, QueueCon
 
                     @Override
                     public Response processControlCommand(ControlCommand command) throws Exception {
-                        onControlCommand(command);
                         return null;
                     }
 
@@ -2221,25 +2220,6 @@ public class ActiveMQConnection implements Connection, TopicConnection, QueueCon
         }
     }
 
-    protected void onControlCommand(ControlCommand command) {
-        String text = command.getCommand();
-        if (text != null) {
-            if ("shutdown".equals(text)) {
-                LOG.info("JVM told to shutdown");
-                System.exit(0);
-            }
-
-            // TODO Should we handle the "close" case?
-            // if (false && "close".equals(text)){
-            //     LOG.error("Broker " + getBrokerInfo() + "shutdown connection");
-            //     try {
-            //         close();
-            //     } catch (JMSException e) {
-            //     }
-            // }
-        }
-    }
-
     protected void onConnectionControl(ConnectionControl command) {
         if (command.isFaultTolerant()) {
             this.optimizeAcknowledge = false;