activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gtu...@apache.org
Subject git commit: https://issues.apache.org/jira/browse/AMQ-4757 reinstate brokerUrl prop to allow rar admin-object init of xa pool
Date Tue, 14 Jan 2014 16:09:12 GMT
Updated Branches:
  refs/heads/trunk 2a7c34997 -> 5c9dcee7e


https://issues.apache.org/jira/browse/AMQ-4757 reinstate brokerUrl prop to allow rar admin-object
init of xa pool


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

Branch: refs/heads/trunk
Commit: 5c9dcee7ed4b4a13f54e9221be4891d2ac0f0f9e
Parents: 2a7c349
Author: gtully <gary.tully@gmail.com>
Authored: Tue Jan 14 15:55:10 2014 +0000
Committer: gtully <gary.tully@gmail.com>
Committed: Tue Jan 14 15:57:00 2014 +0000

----------------------------------------------------------------------
 .../pool/XaPooledConnectionFactory.java         | 12 +++++++
 .../activemq/pool/ConfigFromPropsTest.java      | 38 ++++++++++++++++++++
 2 files changed, 50 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq/blob/5c9dcee7/activemq-pool/src/main/java/org/apache/activemq/pool/XaPooledConnectionFactory.java
----------------------------------------------------------------------
diff --git a/activemq-pool/src/main/java/org/apache/activemq/pool/XaPooledConnectionFactory.java
b/activemq-pool/src/main/java/org/apache/activemq/pool/XaPooledConnectionFactory.java
index 09a1c0a..7465253 100644
--- a/activemq-pool/src/main/java/org/apache/activemq/pool/XaPooledConnectionFactory.java
+++ b/activemq-pool/src/main/java/org/apache/activemq/pool/XaPooledConnectionFactory.java
@@ -50,6 +50,7 @@ import org.slf4j.LoggerFactory;
 public class XaPooledConnectionFactory extends org.apache.activemq.jms.pool.XaPooledConnectionFactory
implements JNDIStorableInterface, Service {
     public static final String POOL_PROPS_PREFIX = "pool";
     private static final transient Logger LOG = LoggerFactory.getLogger(org.apache.activemq.jms.pool.XaPooledConnectionFactory.class);
+    private String brokerUrl;
 
     public XaPooledConnectionFactory() {
         super();
@@ -155,4 +156,15 @@ public class XaPooledConnectionFactory extends org.apache.activemq.jms.pool.XaPo
     public Reference getReference() throws NamingException {
         return JNDIReferenceFactory.createReference(this.getClass().getName(), this);
     }
+
+    public void setBrokerUrl(String url) {
+        if (brokerUrl == null || !brokerUrl.equals(url)) {
+            brokerUrl = url;
+            setConnectionFactory(new ActiveMQXAConnectionFactory(brokerUrl));
+        }
+    }
+
+    public String getBrokerUrl() {
+        return brokerUrl;
+    }
 }

http://git-wip-us.apache.org/repos/asf/activemq/blob/5c9dcee7/activemq-pool/src/test/java/org/apache/activemq/pool/ConfigFromPropsTest.java
----------------------------------------------------------------------
diff --git a/activemq-pool/src/test/java/org/apache/activemq/pool/ConfigFromPropsTest.java
b/activemq-pool/src/test/java/org/apache/activemq/pool/ConfigFromPropsTest.java
new file mode 100644
index 0000000..56b91a2
--- /dev/null
+++ b/activemq-pool/src/test/java/org/apache/activemq/pool/ConfigFromPropsTest.java
@@ -0,0 +1,38 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.pool;
+
+import javax.jms.Connection;
+
+import org.junit.Test;
+
+import static junit.framework.Assert.assertNotNull;
+
+public class ConfigFromPropsTest {
+
+    XaPooledConnectionFactory underTest;
+
+    @Test
+    public void testBrokerUrlForRarAdminObject() throws Exception {
+        underTest = new XaPooledConnectionFactory();
+        underTest.setBrokerUrl("vm://localhost?broker.persistent=false");
+        Connection connection = underTest.createConnection();
+        assertNotNull(connection);
+        connection.close();
+        assertNotNull(underTest.getBrokerUrl());
+    }
+}


Mime
View raw message