activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbert...@apache.org
Subject [2/2] activemq-artemis git commit: ARTEMIS-519 protocol-manager-factory is not implemented on ConnectionFactoryControl
Date Mon, 16 May 2016 16:24:44 GMT
ARTEMIS-519  protocol-manager-factory is not implemented on ConnectionFactoryControl


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

Branch: refs/heads/master
Commit: b51da98f473aaea7f174e1c0063d40a36f49f3f6
Parents: 1ad1366
Author: bayern39 <mchen@redhat.com>
Authored: Mon May 16 17:11:59 2016 +0800
Committer: jbertram <jbertram@apache.org>
Committed: Mon May 16 11:23:08 2016 -0500

----------------------------------------------------------------------
 .../api/jms/management/ConnectionFactoryControl.java      | 10 ++++++++++
 .../artemis/jms/client/ActiveMQConnectionFactory.java     |  4 ++--
 .../management/impl/JMSConnectionFactoryControlImpl.java  | 10 ++++++++++
 3 files changed, 22 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b51da98f/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/ConnectionFactoryControl.java
----------------------------------------------------------------------
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/ConnectionFactoryControl.java
b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/ConnectionFactoryControl.java
index 52722f3..f3ddd62 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/ConnectionFactoryControl.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/ConnectionFactoryControl.java
@@ -376,6 +376,16 @@ public interface ConnectionFactoryControl {
    DiscoveryGroupConfiguration getDiscoveryGroupConfiguration();
 
    /**
+    * get the protocol manager factory name
+    */
+   String getProtocolManagerFactoryStr();
+
+   /**
+    * set the protocol manager factory name
+    */
+   void setProtocolManagerFactoryStr(String protocolManagerFactoryStr);
+
+   /**
     * Add the Registry binding to this destination
     */
    @Operation(desc = "Adds the factory to another Registry binding")

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b51da98f/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQConnectionFactory.java
----------------------------------------------------------------------
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQConnectionFactory.java
b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQConnectionFactory.java
index 0dce3fc..ce2aa3a 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQConnectionFactory.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQConnectionFactory.java
@@ -134,11 +134,11 @@ public class ActiveMQConnectionFactory implements Externalizable, Referenceable,
 
    public void setProtocolManagerFactoryStr(final String protocolManagerFactoryStr) {
 
-      if (protocolManagerFactoryStr != null && !protocolManagerFactoryStr.trim().isEmpty())
{
+      if (protocolManagerFactoryStr != null && !protocolManagerFactoryStr.trim().isEmpty()
&&
+               !protocolManagerFactoryStr.equals("undefined")) {
          AccessController.doPrivileged(new PrivilegedAction<Object>() {
             @Override
             public Object run() {
-
                ClientProtocolManagerFactory protocolManagerFactory =
                   (ClientProtocolManagerFactory) ClassloadingUtil.newInstanceFromClassLoader(protocolManagerFactoryStr);
                serverLocator.setProtocolManagerFactory(protocolManagerFactory);

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b51da98f/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/management/impl/JMSConnectionFactoryControlImpl.java
----------------------------------------------------------------------
diff --git a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/management/impl/JMSConnectionFactoryControlImpl.java
b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/management/impl/JMSConnectionFactoryControlImpl.java
index 15f165e..71239c7 100644
--- a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/management/impl/JMSConnectionFactoryControlImpl.java
+++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/management/impl/JMSConnectionFactoryControlImpl.java
@@ -432,6 +432,16 @@ public class JMSConnectionFactoryControlImpl extends StandardMBean implements
Co
    }
 
    @Override
+   public void setProtocolManagerFactoryStr(String protocolManagerFactoryStr) {
+      cfConfig.setProtocolManagerFactoryStr(protocolManagerFactoryStr);
+      recreateCF();
+   }
+
+   @Override
+   public String getProtocolManagerFactoryStr() {
+      return cfConfig.getProtocolManagerFactoryStr();
+   }
+   @Override
    public boolean isAutoGroup() {
       return cfConfig.isAutoGroup();
    }


Mime
View raw message