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 91D741811F for ; Thu, 9 Jul 2015 22:11:43 +0000 (UTC) Received: (qmail 53213 invoked by uid 500); 9 Jul 2015 22:11:43 -0000 Delivered-To: apmail-qpid-commits-archive@qpid.apache.org Received: (qmail 53078 invoked by uid 500); 9 Jul 2015 22:11:43 -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 51801 invoked by uid 99); 9 Jul 2015 22:11:42 -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; Thu, 09 Jul 2015 22:11:42 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 48288E6860; Thu, 9 Jul 2015 22:11:42 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aconway@apache.org To: commits@qpid.apache.org Date: Thu, 09 Jul 2015 22:12:10 -0000 Message-Id: <3159fae1e8e54754a20538e31196a3aa@git.apache.org> In-Reply-To: <26cdf25ef7f447acad1571ecc085b19e@git.apache.org> References: <26cdf25ef7f447acad1571ecc085b19e@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [30/50] qpid-proton git commit: wired in allowSkip wired in allowSkip Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/940d843f Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/940d843f Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/940d843f Branch: refs/heads/cjansen-cpp-client Commit: 940d843f36cb4cceb7f2a6bde8c5b78247392384 Parents: 1d8a0a4 Author: Rafael Schloming Authored: Mon Jul 6 11:19:30 2015 -0400 Committer: Rafael Schloming Committed: Mon Jul 6 11:19:30 2015 -0400 ---------------------------------------------------------------------- .../main/java/org/apache/qpid/proton/engine/impl/SaslImpl.java | 6 +++--- proton-j/src/main/resources/csasl.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/940d843f/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/SaslImpl.java ---------------------------------------------------------------------- diff --git a/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/SaslImpl.java b/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/SaslImpl.java index 6efb140..dc731dc 100644 --- a/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/SaslImpl.java +++ b/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/SaslImpl.java @@ -83,6 +83,7 @@ public class SaslImpl implements Sasl, SaslFrameBody.SaslFrameBodyHandler, private Symbol _chosenMechanism; private Role _role; + private boolean _allowSkip = true; /** * @param maxFrameSize the size of the input and output buffers @@ -479,8 +480,7 @@ public class SaslImpl implements Sasl, SaslFrameBody.SaslFrameBodyHandler, @Override public void allowSkip(boolean allowSkip) { - //TODO: implement - throw new ProtonUnsupportedOperationException(); + _allowSkip = allowSkip; } public TransportWrapper wrap(final TransportInput input, final TransportOutput output) @@ -488,7 +488,7 @@ public class SaslImpl implements Sasl, SaslFrameBody.SaslFrameBodyHandler, return new SaslSniffer(new SaslTransportWrapper(input, output), new PlainTransportWrapper(output, input)) { protected boolean isDeterminationMade() { - if (_role == Role.SERVER) { + if (_role == Role.SERVER && _allowSkip) { return super.isDeterminationMade(); } else { _selectedTransportWrapper = _wrapper1; http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/940d843f/proton-j/src/main/resources/csasl.py ---------------------------------------------------------------------- diff --git a/proton-j/src/main/resources/csasl.py b/proton-j/src/main/resources/csasl.py index 5188f11..a5fe0a6 100644 --- a/proton-j/src/main/resources/csasl.py +++ b/proton-j/src/main/resources/csasl.py @@ -60,7 +60,7 @@ SASL_OUTCOMES_J2P = { } def pn_transport_require_auth(transport, require): - transport.impl.sasl().allowSkip(not require) + raise Skipped('Not supported in Proton-J') # TODO: Placeholders def pn_transport_is_authenticated(transport): --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org For additional commands, e-mail: commits-help@qpid.apache.org