You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2015/07/14 15:51:51 UTC
[1/2] activemq-artemis git commit: fix empty keystore files fix
Collections.EMPTY_MAP doesn't support put() method issue
Repository: activemq-artemis
Updated Branches:
refs/heads/master 2e9705cd9 -> f17991e58
fix empty keystore files
fix Collections.EMPTY_MAP doesn't support put() method issue
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/779092f4
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/779092f4
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/779092f4
Branch: refs/heads/master
Commit: 779092f48fc61aaa37d8b2ad5cc00064a6822e05
Parents: 2e9705c
Author: Howard Gao <hg...@redhat.com>
Authored: Tue Jul 14 20:07:00 2015 +0800
Committer: Howard Gao <hg...@redhat.com>
Committed: Tue Jul 14 20:07:00 2015 +0800
----------------------------------------------------------------------
.../apache/activemq/ActiveMQConnectionFactory.java | 5 +++++
.../src/test/java/client.keystore | Bin 0 -> 2197 bytes
.../src/test/java/dummy.keystore | Bin 0 -> 1224 bytes
.../src/test/java/server.keystore | Bin 0 -> 2197 bytes
.../src/test/resources/client.keystore | Bin 0 -> 2197 bytes
.../src/test/resources/dummy.keystore | Bin 0 -> 1224 bytes
.../src/test/resources/server.keystore | Bin 0 -> 2197 bytes
7 files changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/779092f4/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/ActiveMQConnectionFactory.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/ActiveMQConnectionFactory.java b/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/ActiveMQConnectionFactory.java
index c530ab7..0de77f7 100644
--- a/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/ActiveMQConnectionFactory.java
+++ b/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/ActiveMQConnectionFactory.java
@@ -20,6 +20,7 @@ import java.net.URI;
import java.net.URISyntaxException;
import java.security.AccessController;
import java.security.PrivilegedAction;
+import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
@@ -241,6 +242,10 @@ public class ActiveMQConnectionFactory extends JNDIBaseStorable implements Conne
String scheme = uri.getScheme();
if ("vm".equals(scheme)) {
Map<String, String> params = URISupport.parseParameters(uri);
+ //EMPTY_MAP is immutable, so use a normal map instead.
+ if (params == Collections.EMPTY_MAP) {
+ params = new HashMap<String, String>();
+ }
params.put("invmBrokerId", uri.getHost() == null ? "localhost" : uri.getHost());
defaultTcpUri = URISupport.createRemainingURI(defaultTcpUri, params);
return defaultTcpUri;
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/779092f4/tests/activemq5-unit-tests/src/test/java/client.keystore
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/client.keystore b/tests/activemq5-unit-tests/src/test/java/client.keystore
old mode 100644
new mode 100755
index e69de29..a96e55c
Binary files a/tests/activemq5-unit-tests/src/test/java/client.keystore and b/tests/activemq5-unit-tests/src/test/java/client.keystore differ
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/779092f4/tests/activemq5-unit-tests/src/test/java/dummy.keystore
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/dummy.keystore b/tests/activemq5-unit-tests/src/test/java/dummy.keystore
index e69de29..9f705e5 100644
Binary files a/tests/activemq5-unit-tests/src/test/java/dummy.keystore and b/tests/activemq5-unit-tests/src/test/java/dummy.keystore differ
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/779092f4/tests/activemq5-unit-tests/src/test/java/server.keystore
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/server.keystore b/tests/activemq5-unit-tests/src/test/java/server.keystore
old mode 100644
new mode 100755
index e69de29..0d549fc
Binary files a/tests/activemq5-unit-tests/src/test/java/server.keystore and b/tests/activemq5-unit-tests/src/test/java/server.keystore differ
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/779092f4/tests/activemq5-unit-tests/src/test/resources/client.keystore
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/resources/client.keystore b/tests/activemq5-unit-tests/src/test/resources/client.keystore
index e69de29..a96e55c 100755
Binary files a/tests/activemq5-unit-tests/src/test/resources/client.keystore and b/tests/activemq5-unit-tests/src/test/resources/client.keystore differ
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/779092f4/tests/activemq5-unit-tests/src/test/resources/dummy.keystore
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/resources/dummy.keystore b/tests/activemq5-unit-tests/src/test/resources/dummy.keystore
index e69de29..9f705e5 100644
Binary files a/tests/activemq5-unit-tests/src/test/resources/dummy.keystore and b/tests/activemq5-unit-tests/src/test/resources/dummy.keystore differ
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/779092f4/tests/activemq5-unit-tests/src/test/resources/server.keystore
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/resources/server.keystore b/tests/activemq5-unit-tests/src/test/resources/server.keystore
index e69de29..0d549fc 100755
Binary files a/tests/activemq5-unit-tests/src/test/resources/server.keystore and b/tests/activemq5-unit-tests/src/test/resources/server.keystore differ
[2/2] activemq-artemis git commit: This closes #79 fix on openwire
testsuite
Posted by cl...@apache.org.
This closes #79 fix on openwire testsuite
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/f17991e5
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/f17991e5
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/f17991e5
Branch: refs/heads/master
Commit: f17991e58c60d71e529e4741ed691e8f02016a8b
Parents: 2e9705c 779092f
Author: Clebert Suconic <cl...@apache.org>
Authored: Tue Jul 14 09:50:57 2015 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Tue Jul 14 09:50:57 2015 -0400
----------------------------------------------------------------------
.../apache/activemq/ActiveMQConnectionFactory.java | 5 +++++
.../src/test/java/client.keystore | Bin 0 -> 2197 bytes
.../src/test/java/dummy.keystore | Bin 0 -> 1224 bytes
.../src/test/java/server.keystore | Bin 0 -> 2197 bytes
.../src/test/resources/client.keystore | Bin 0 -> 2197 bytes
.../src/test/resources/dummy.keystore | Bin 0 -> 1224 bytes
.../src/test/resources/server.keystore | Bin 0 -> 2197 bytes
7 files changed, 5 insertions(+)
----------------------------------------------------------------------