You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ta...@apache.org on 2014/10/14 17:48:05 UTC
[1/2] git commit: https://issues.apache.org/jira/browse/AMQ-5395
Repository: activemq
Updated Branches:
refs/heads/trunk 0cf7c0bc4 -> 27833d025
https://issues.apache.org/jira/browse/AMQ-5395
Check for the presence of a prefix before asking for a substring
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/78446ad1
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/78446ad1
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/78446ad1
Branch: refs/heads/trunk
Commit: 78446ad1759706df7662018571e68bc471a6ac28
Parents: 0cf7c0b
Author: Timothy Bish <ta...@gmail.com>
Authored: Tue Oct 14 11:46:49 2014 -0400
Committer: Timothy Bish <ta...@gmail.com>
Committed: Tue Oct 14 11:46:49 2014 -0400
----------------------------------------------------------------------
.../activemq/transport/amqp/ActiveMQJMSVendor.java | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq/blob/78446ad1/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/ActiveMQJMSVendor.java
----------------------------------------------------------------------
diff --git a/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/ActiveMQJMSVendor.java b/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/ActiveMQJMSVendor.java
index 59c29e3..b576c6b 100644
--- a/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/ActiveMQJMSVendor.java
+++ b/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/ActiveMQJMSVendor.java
@@ -47,6 +47,8 @@ public class ActiveMQJMSVendor extends JMSVendor {
final public static ActiveMQJMSVendor INSTANCE = new ActiveMQJMSVendor();
+ private static final String PREFIX_MARKER = "://";
+
private ActiveMQJMSVendor() {
}
@@ -87,7 +89,13 @@ public class ActiveMQJMSVendor extends JMSVendor {
@Override
public <T extends Destination> T createDestination(String name, Class<T> kind) {
- String destinationName = name.substring(name.lastIndexOf("://") + 3);
+ String destinationName = name;
+ int prefixEnd = name.lastIndexOf(PREFIX_MARKER);
+
+ if (prefixEnd >= 0) {
+ destinationName = name.substring(prefixEnd + PREFIX_MARKER.length());
+ }
+
if (kind == Queue.class) {
return kind.cast(new ActiveMQQueue(destinationName));
}
@@ -100,6 +108,7 @@ public class ActiveMQJMSVendor extends JMSVendor {
if (kind == TemporaryTopic.class) {
return kind.cast(new ActiveMQTempTopic(destinationName));
}
+
return kind.cast(ActiveMQDestination.createDestination(name, ActiveMQDestination.QUEUE_TYPE));
}
[2/2] git commit: Remove unused imports
Posted by ta...@apache.org.
Remove unused imports
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/27833d02
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/27833d02
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/27833d02
Branch: refs/heads/trunk
Commit: 27833d025e220492d5c3494a8d46b6c61ea24ee1
Parents: 78446ad
Author: Timothy Bish <ta...@gmail.com>
Authored: Tue Oct 14 11:47:48 2014 -0400
Committer: Timothy Bish <ta...@gmail.com>
Committed: Tue Oct 14 11:47:48 2014 -0400
----------------------------------------------------------------------
.../transport/amqp/JmsClientRequestResponseTest.java | 1 -
.../transport/amqp/joram/JoramJmsNioPlusSslTest.java | 4 ----
.../activemq/transport/amqp/joram/JoramJmsNioTest.java | 1 -
.../apache/activemq/transport/amqp/joram/JoramSslTest.java | 8 ++------
4 files changed, 2 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq/blob/27833d02/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/JmsClientRequestResponseTest.java
----------------------------------------------------------------------
diff --git a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/JmsClientRequestResponseTest.java b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/JmsClientRequestResponseTest.java
index c79493a..87ec883 100644
--- a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/JmsClientRequestResponseTest.java
+++ b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/JmsClientRequestResponseTest.java
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.activemq.transport.amqp;
import static org.junit.Assert.assertEquals;
http://git-wip-us.apache.org/repos/asf/activemq/blob/27833d02/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/joram/JoramJmsNioPlusSslTest.java
----------------------------------------------------------------------
diff --git a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/joram/JoramJmsNioPlusSslTest.java b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/joram/JoramJmsNioPlusSslTest.java
index 5cd6415..e6b5a91 100644
--- a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/joram/JoramJmsNioPlusSslTest.java
+++ b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/joram/JoramJmsNioPlusSslTest.java
@@ -16,21 +16,17 @@
*/
package org.apache.activemq.transport.amqp.joram;
-import java.security.SecureRandom;
-
import javax.net.ssl.KeyManager;
import javax.net.ssl.SSLContext;
import javax.net.ssl.TrustManager;
import org.apache.activemq.transport.amqp.DefaultTrustManager;
-
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Rule;
import org.junit.rules.Timeout;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
-
import org.objectweb.jtests.jms.conform.connection.ConnectionTest;
import org.objectweb.jtests.jms.conform.connection.TopicConnectionTest;
import org.objectweb.jtests.jms.conform.message.MessageBodyTest;
http://git-wip-us.apache.org/repos/asf/activemq/blob/27833d02/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/joram/JoramJmsNioTest.java
----------------------------------------------------------------------
diff --git a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/joram/JoramJmsNioTest.java b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/joram/JoramJmsNioTest.java
index b50bbff..afb6ece 100644
--- a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/joram/JoramJmsNioTest.java
+++ b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/joram/JoramJmsNioTest.java
@@ -17,7 +17,6 @@
package org.apache.activemq.transport.amqp.joram;
import org.junit.BeforeClass;
-import org.junit.Ignore;
import org.junit.Rule;
import org.junit.rules.Timeout;
import org.junit.runner.RunWith;
http://git-wip-us.apache.org/repos/asf/activemq/blob/27833d02/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/joram/JoramSslTest.java
----------------------------------------------------------------------
diff --git a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/joram/JoramSslTest.java b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/joram/JoramSslTest.java
index 4070f1f..07fab5c 100644
--- a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/joram/JoramSslTest.java
+++ b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/joram/JoramSslTest.java
@@ -16,21 +16,17 @@
*/
package org.apache.activemq.transport.amqp.joram;
-import java.security.SecureRandom;
-
import javax.net.ssl.KeyManager;
import javax.net.ssl.SSLContext;
import javax.net.ssl.TrustManager;
import org.apache.activemq.transport.amqp.DefaultTrustManager;
-
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Rule;
import org.junit.rules.Timeout;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
-
import org.objectweb.jtests.jms.conform.connection.ConnectionTest;
import org.objectweb.jtests.jms.conform.message.MessageBodyTest;
import org.objectweb.jtests.jms.conform.message.MessageDefaultTest;
@@ -79,7 +75,7 @@ public class JoramSslTest {
@Rule
public Timeout to = new Timeout(10 * 1000);
static SSLContext def;
-
+
@BeforeClass
public static void beforeClass() throws Exception {
System.setProperty("joram.jms.test.file", getJmsTestFileName());
@@ -94,7 +90,7 @@ public class JoramSslTest {
System.clearProperty("joram.jms.test.file");
SSLContext.setDefault(def);
}
-
+
public static String getJmsTestFileName() {
return "providerSSL.properties";