Return-Path: X-Original-To: apmail-qpid-commits-archive@www.apache.org Delivered-To: apmail-qpid-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id B217C17D1A for ; Mon, 1 Jun 2015 21:46:12 +0000 (UTC) Received: (qmail 92004 invoked by uid 500); 1 Jun 2015 21:46:12 -0000 Delivered-To: apmail-qpid-commits-archive@qpid.apache.org Received: (qmail 91978 invoked by uid 500); 1 Jun 2015 21:46:12 -0000 Mailing-List: contact commits-help@qpid.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@qpid.apache.org Delivered-To: mailing list commits@qpid.apache.org Received: (qmail 91968 invoked by uid 99); 1 Jun 2015 21:46:12 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Jun 2015 21:46:12 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 668F9E083A; Mon, 1 Jun 2015 21:46:12 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: tabish@apache.org To: commits@qpid.apache.org Message-Id: <7fee1b9d696f49089e6c3a5f9c38bca0@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: qpid-jms git commit: https://issues.apache.org/jira/browse/QPIDJMS-63 Date: Mon, 1 Jun 2015 21:46:12 +0000 (UTC) Repository: qpid-jms Updated Branches: refs/heads/master d94972022 -> 74acf459f https://issues.apache.org/jira/browse/QPIDJMS-63 Apply patch from scholzj to resolve issues with SASL ANONYMOUS and the C++ broker. Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/74acf459 Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/74acf459 Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/74acf459 Branch: refs/heads/master Commit: 74acf459f9dfcc2c8ead510d41dcfdcf053bc80b Parents: d949720 Author: Timothy Bish Authored: Mon Jun 1 17:45:59 2015 -0400 Committer: Timothy Bish Committed: Mon Jun 1 17:45:59 2015 -0400 ---------------------------------------------------------------------- .../src/main/java/org/apache/qpid/jms/sasl/AnonymousMechanism.java | 2 +- .../test/java/org/apache/qpid/jms/test/testpeer/TestAmqpPeer.java | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/74acf459/qpid-jms-client/src/main/java/org/apache/qpid/jms/sasl/AnonymousMechanism.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/sasl/AnonymousMechanism.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/sasl/AnonymousMechanism.java index c8d23da..903a5fe 100644 --- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/sasl/AnonymousMechanism.java +++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/sasl/AnonymousMechanism.java @@ -23,7 +23,7 @@ public class AnonymousMechanism extends AbstractMechanism { @Override public byte[] getInitialResponse() { - return null; + return EMPTY; } @Override http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/74acf459/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/TestAmqpPeer.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/TestAmqpPeer.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/TestAmqpPeer.java index a2f0c79..079fbb3 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/TestAmqpPeer.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/TestAmqpPeer.java @@ -379,7 +379,6 @@ public class TestAmqpPeer implements AutoCloseable addHandler(new SaslInitMatcher() .withMechanism(equalTo(Symbol.valueOf("ANONYMOUS"))) - .withInitialResponse(nullValue()) .onSuccess(new AmqpPeerRunnable() { @Override @@ -528,7 +527,6 @@ public class TestAmqpPeer implements AutoCloseable addHandler(new SaslInitMatcher() .withMechanism(equalTo(Symbol.valueOf("ANONYMOUS"))) - .withInitialResponse(nullValue()) .onSuccess(new AmqpPeerRunnable() { @Override --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org For additional commands, e-mail: commits-help@qpid.apache.org