qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject qpid-jms git commit: https://issues.apache.org/jira/browse/QPIDJMS-63
Date Mon, 01 Jun 2015 21:46:12 GMT
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 <tabish121@gmail.com>
Authored: Mon Jun 1 17:45:59 2015 -0400
Committer: Timothy Bish <tabish121@gmail.com>
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


Mime
View raw message