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 2016/11/02 23:01:25 UTC
[1/2] activemq-artemis git commit: Revert "ARTEMIS-833 maxHops
defaults to 0 when creating artemis cluster configuration through cli" this
is breaking client size load balance example.
Repository: activemq-artemis
Updated Branches:
refs/heads/master 9f7fc8836 -> 5965a4589
Revert "ARTEMIS-833 maxHops defaults to 0 when creating artemis cluster configuration through cli"
this is breaking client size load balance example.
This reverts commit 3de65682cecfaf2f37ae41cd709d983cd0418c3c.
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/e89f6a1b
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/e89f6a1b
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/e89f6a1b
Branch: refs/heads/master
Commit: e89f6a1bfdc6a29422022717e231234c150f314b
Parents: 9f7fc88
Author: Clebert Suconic <cl...@apache.org>
Authored: Wed Nov 2 18:52:36 2016 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Wed Nov 2 19:00:09 2016 -0400
----------------------------------------------------------------------
.../main/java/org/apache/activemq/artemis/cli/commands/Create.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/e89f6a1b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java
----------------------------------------------------------------------
diff --git a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java
index 5bd55e9..77a2e68 100644
--- a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java
+++ b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java
@@ -137,7 +137,7 @@ public class Create extends InputAbstract {
boolean clustered = false;
@Option(name = "--max-hops", description = "Number of hops on the cluster configuration")
- int maxHops = 1;
+ int maxHops = 0;
@Option(name = "--message-load-balancing", description = "Load balancing policy on cluster. [ON_DEMAND (default) | STRICT | OFF]")
MessageLoadBalancingType messageLoadBalancing = MessageLoadBalancingType.ON_DEMAND;
[2/2] activemq-artemis git commit: ARTEMIS-786 Using RandomUtil
instead of SecureRandom..
Posted by cl...@apache.org.
ARTEMIS-786 Using RandomUtil instead of SecureRandom..
This was introducing several performance hits. I was running the examples and they were not completing at all on my environment.
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/5965a458
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/5965a458
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/5965a458
Branch: refs/heads/master
Commit: 5965a458945c98f61f1e1e3db418082b68e9df62
Parents: e89f6a1
Author: Clebert Suconic <cl...@apache.org>
Authored: Wed Nov 2 18:09:25 2016 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Wed Nov 2 19:00:13 2016 -0400
----------------------------------------------------------------------
.../activemq/artemis/utils/DefaultSensitiveStringCodec.java | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/5965a458/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/DefaultSensitiveStringCodec.java
----------------------------------------------------------------------
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/DefaultSensitiveStringCodec.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/DefaultSensitiveStringCodec.java
index 227a60b..1861d0e 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/DefaultSensitiveStringCodec.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/DefaultSensitiveStringCodec.java
@@ -22,7 +22,6 @@ import javax.crypto.spec.PBEKeySpec;
import javax.crypto.spec.SecretKeySpec;
import java.math.BigInteger;
import java.security.NoSuchAlgorithmException;
-import java.security.SecureRandom;
import java.security.spec.InvalidKeySpecException;
import java.util.Arrays;
import java.util.Collections;
@@ -189,10 +188,7 @@ public class DefaultSensitiveStringCodec implements SensitiveDataCodec<String> {
}
public byte[] getSalt() throws NoSuchAlgorithmException {
- byte[] salt = new byte[this.saltLength];
-
- SecureRandom sr = SecureRandom.getInstance(this.randomScheme);
- sr.nextBytes(salt);
+ byte[] salt = RandomUtil.randomBytes(this.saltLength);
return salt;
}