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 2017/02/22 03:22:24 UTC
[1/3] activemq-artemis git commit: This closes #1035
Repository: activemq-artemis
Updated Branches:
refs/heads/master dfdc4ff75 -> 6974b115f
This closes #1035
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/6974b115
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/6974b115
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/6974b115
Branch: refs/heads/master
Commit: 6974b115f7c3e5388a0a650d746cf37aa6e50634
Parents: dfdc4ff c08dbba
Author: Clebert Suconic <cl...@apache.org>
Authored: Tue Feb 21 22:22:12 2017 -0500
Committer: Clebert Suconic <cl...@apache.org>
Committed: Tue Feb 21 22:22:12 2017 -0500
----------------------------------------------------------------------
.../activemq/artemis/core/protocol/stomp/StompFrame.java | 4 ++++
examples/features/standard/security/pom.xml | 1 +
.../main/resources/activemq/server0/artemis-users.properties | 8 ++++----
.../security/src/main/resources/activemq/server0/broker.xml | 5 ++---
4 files changed, 11 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
[2/3] activemq-artemis git commit: NO-JIRA fix-up security example
Posted by cl...@apache.org.
NO-JIRA fix-up security example
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/c08dbba7
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/c08dbba7
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/c08dbba7
Branch: refs/heads/master
Commit: c08dbba7be60512498ffb96b5ee095659083d4c6
Parents: b7d7d13
Author: Justin Bertram <jb...@apache.org>
Authored: Tue Feb 21 11:15:42 2017 -0600
Committer: Clebert Suconic <cl...@apache.org>
Committed: Tue Feb 21 22:22:12 2017 -0500
----------------------------------------------------------------------
examples/features/standard/security/pom.xml | 1 +
.../main/resources/activemq/server0/artemis-users.properties | 8 ++++----
.../security/src/main/resources/activemq/server0/broker.xml | 5 ++---
3 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/c08dbba7/examples/features/standard/security/pom.xml
----------------------------------------------------------------------
diff --git a/examples/features/standard/security/pom.xml b/examples/features/standard/security/pom.xml
index 3aed9cf..0d8c522 100644
--- a/examples/features/standard/security/pom.xml
+++ b/examples/features/standard/security/pom.xml
@@ -56,6 +56,7 @@ under the License.
</goals>
<configuration>
<ignore>${noServer}</ignore>
+ <allowAnonymous>false</allowAnonymous>
</configuration>
</execution>
<execution>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/c08dbba7/examples/features/standard/security/src/main/resources/activemq/server0/artemis-users.properties
----------------------------------------------------------------------
diff --git a/examples/features/standard/security/src/main/resources/activemq/server0/artemis-users.properties b/examples/features/standard/security/src/main/resources/activemq/server0/artemis-users.properties
index 0a206c6..9a4c336 100644
--- a/examples/features/standard/security/src/main/resources/activemq/server0/artemis-users.properties
+++ b/examples/features/standard/security/src/main/resources/activemq/server0/artemis-users.properties
@@ -14,7 +14,7 @@
## See the License for the specific language governing permissions and
## limitations under the License.
## ---------------------------------------------------------------------------
-bill=activemq
-andrew=activemq1
-frank=activemq2
-sam=activemq3
\ No newline at end of file
+bill = ENC(1024:020FEC8DB7EBBCB987FD25F1188EA71FA13FD4E0BF504963891EDC97E1ED1285:3E53D34A96F9995612C7C585CA04BA63CF5F531C92510E882960F848BFC3982AF47FCD40AB888F9AC10648CCEBA1DD52C0F0A312B2C90225D9A46DDC50198B3C)
+andrew = ENC(1024:3E09F4D16A6970F3C40E24784AFE64AFD66349174AB20B2609109646A8F0561F:F22063143058EBCF47A0ACA1C29DBCB82C4AF15E510F5C801B47928AEA1836D1480BFD0DFD0320BA567D1A32C98859C02350AE271DC530F29D7E16E910E251AD)
+frank = ENC(1024:49292EEC8AA19AB5390A0F0D67AA5A3978DE1AF0F561B641A1CE90B3C9637AAD:22A8F9A4B144B9CC173F3B1D5A2B09FE57642234534C2EB3A805DB7D5F7FEA398B58EB9380B8EA69B916B5CFA23BC7573E09A87A20C0DF1A35A1134270260BE4)
+sam = ENC(1024:39832F10D9734D7E6EECE16BCEAA5E2917D384B4CE482A2A4B3D3E7A550B0A5C:CCA47914C6DD64AE6B69FE977BB445CBCDEA50D458E7F42AA341FA84A11C302E2EAB072E57B41A636589C89246911A6A49424CBA4B629F4846826183E9AD9DA1)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/c08dbba7/examples/features/standard/security/src/main/resources/activemq/server0/broker.xml
----------------------------------------------------------------------
diff --git a/examples/features/standard/security/src/main/resources/activemq/server0/broker.xml b/examples/features/standard/security/src/main/resources/activemq/server0/broker.xml
index bfb0528..8e27293 100644
--- a/examples/features/standard/security/src/main/resources/activemq/server0/broker.xml
+++ b/examples/features/standard/security/src/main/resources/activemq/server0/broker.xml
@@ -16,9 +16,8 @@ software distributed under the License is distributed on an
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
---><configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
-
-
+-->
+<configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
<core xmlns="urn:activemq:core">
[3/3] activemq-artemis git commit: NO-JIRA fix possible STOMP NPE
Posted by cl...@apache.org.
NO-JIRA fix possible STOMP NPE
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/b7d7d134
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/b7d7d134
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/b7d7d134
Branch: refs/heads/master
Commit: b7d7d134ebe1dea21c6d89c60410d4f54ef78a6c
Parents: dfdc4ff
Author: Justin Bertram <jb...@apache.org>
Authored: Tue Feb 21 09:08:13 2017 -0600
Committer: Clebert Suconic <cl...@apache.org>
Committed: Tue Feb 21 22:22:12 2017 -0500
----------------------------------------------------------------------
.../apache/activemq/artemis/core/protocol/stomp/StompFrame.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b7d7d134/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompFrame.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompFrame.java b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompFrame.java
index 50c3108..439eba2 100644
--- a/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompFrame.java
+++ b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompFrame.java
@@ -171,6 +171,10 @@ public class StompFrame {
}
public String encode(String str) {
+ if (str == null) {
+ return "";
+ }
+
int len = str.length();
char[] buffer = new char[2 * len];